blableblo
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/WebContent/WEB-INF/jsp/assignment/self_approval.jsp
	ProjectTaps/WebContent/WEB-INF/jsp/dashboard/self_approval.jsp