support for login by username and/or email
Merge pull request #2 from bartes/login-by-email

support for login by username and/or email