User authetication username/email

Added the ability to login using either username or email