add google provider to omniauth
Merge branch 'dev'