authentication with google and facebook
Merge origin/master