update rails version
Merge branch 'master' of heroku.com:ocelots-staging
fix google oauth2 error