refactor config
Merge branch 'master' into google-login