Merge branch 'google-login' into 'master'

Google login should work

See merge request !356

app/controllers/v1/omniauth_callbacks_controller.rb

@@ -76,10 +76,13 @@
 
     # break out provider attribute assignment for easy method extension
     def assign_provider_attrs(user, auth_hash)
+      avatar = auth_hash['provider']=='google_oauth2' ? "" : auth_hash['info']['image']
+
+
       user.assign_attributes({
         nickname: auth_hash['info']['nickname'],
         name:     auth_hash['info']['name'],
-        avatar:   auth_hash['info']['image'],
+        avatar:   avatar,
         email:    auth_hash['info']['email']
       })
     end