Merge pull request #480 from testmycode/email-auth

Authenticate user with email if username not found

Author: nygrenh

app/models/user.rb

@@ -123,7 +123,8 @@ def has_password?(submitted_password)
   end
 
   def self.authenticate(login, submitted_password)
-    user = find_by_login(login)
+    user = find_by(login: login)
+    user = find_by(email: login) if user.nil?
     return nil if user.nil?
     return user if user.has_password?(submitted_password)
   end