Allow login with login or email.
Merge pull request #20 from wvengen/feature/login-email-too

Allow login with login or email.