Login with username or email
Added test login with email
Fixing login test
Merge pull request #117 from ar2rsawseen/master

Login using username or email