User is able to login with username or email
Added username and missing validation
Merge branch 'development' into authentication_from_scratch