fix oauth
add google oauth2
Merge remote-tracking branch 'upstream/master'