bug fixes
Merge branch 'master' of
https://github.com/santaza/WebProjectFingerscan.git

Conflicts:
	WebContent/dist/javascript/custom/header.js
	WebContent/dist/javascript/custom/index.js
	WebContent/dist/javascript/custom/listAllAttendance.js
	WebContent/dist/javascript/custom/listSearchSubject.js
	WebContent/index.jsp
	WebContent/main/header.jsp
	src/models/Enrollment.java
	src/utils/CommonUtils.java