Google authentication
fixed merge conflicts