Changed google authentication to Google + Oauth2