Add validation for login and usage of both email and username for login
Merge branch 'master' of https://github.com/vcbr/Bidr