Switch to omniauth-google-oauth2 for authentication.
Fix test.
Merge branch 'master' into uploadToS3

Conflicts:
	Gemfile.lock