Merge branch 'dev'
login page has textfield instead of email field. fixed #71
Merge branch 'hotfix/usernamelogin' into dev
Convert all indents to spaces (fix #70)
Merge branch 'dev' into feature/ui