Merge branch 'master' of https://github.com/IDRASoft-P160-Um3c4/UmecaApp

Conflicts:
	src/Umeca/src/main/webapp/WEB-INF/jsp/supervisor/trackMonitoringPlan/trackCalendar.jsp