12/1/2014

Shows error message when there are incorrect login credentials.
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/angular/app.js
	views/index.html