fix omniauth login
Merge branch 'fix_omniauth_login' into develop