Merge branch 'dev'
login page has textfield instead of email field. fixed #71
Merge branch 'hotfix/usernamelogin' into dev