Login by username or email.
Merge pull request #389 from fxprunayre/feature/login-by-email

Login by username or email.
Merge remote-tracking branch 'origin/develop' into refactor_editorui