719
Merge remote-tracking branch 'origin/hunter'

Conflicts:
	WebContent/page/AuthorityMgr.files/ApplyForHoliday.jsp
	WebContent/page/EmployeeMgr.files/UpdatePwd.jsp