add google omniauth
merge