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

Conflicts:
	web/WEB-INF/web.xml