Merge branch 'develop' of https://github.com/HvA-Project-WEB-Goup/webapplication into develop

Conflicts:
	src/java/controller/HrmController.java