user login should take "username or email"

[holaymolay]

After the most recent updates the log in page only takes email address. The username field should take both username AND password.

[craig429]

Please clarify this. http://codeclubsocial.herokuapp.com/login currently has a username field and a password field. I originally had e-mail/password but I figured username/password was more conventional. Are you saying the user should be able to login using either username OR email in the username field?