tag the local
Merge branch 'master' of https://github.com/hbdrawn/NewProj.git

Conflicts:
	WebContent/systemmanager/js/hdValidate.js
	WebContent/systemmanager/js/login.js
	WebContent/systemmanager/login.jsp