renamed some URLs
merged native login and google login templates/views
user remains signed-in when signing in with google