user model and google_auth
merge with master and remove conflicts
Merge pull request #1 from elpassion/signin_with_google

Signin with google