added the support of username
Merge pull request #25 from hlee/master

added username and login with username or email
Fixed #19