Merge branch 'master' into erich_dev
Adding incorrect username/password to login

Incorrect credentials now redirect back to the login page and display
an error message.
Merge branch 'erich_dev'