login and apply
Merge branch 'master' of
https://github.com/chrisyly/CavalierWebApplication.git

Conflicts:
	CavalierWebApplication/WebContent/WEB-INF/jsp/js/loginForm.js
	CavalierWebApplication/WebContent/WEB-INF/jsp/login.jsp