resorted on using email and password auth
Merge branch 'hotfix-login' into develop

* hotfix-login:
  resorted on using email and password auth

* reason: Facebook auth fails on android phone. Redirect fails.
Merge branch 'develop'

* develop:
  resorted on using email and password auth