Added email property to User.  Adjusted User service to allow logging in with either email or username