can login using username or email@
Merge branch 'username_login'
better login buttons