added ability for users to login via username or email
updatd label to show you can use your email to login
moved UserOrEmal backend to contribute, fixed label on login form
Merge branch 'develop' into feature/refactor-search