Google authentication is working. Facebook will soon
Merge remote-tracking branch 'origin/master'