Commit before Merge
Merge branch 'master' of https://github.com/zaans2/THO4.git

Conflicts:
	src/nl/hu/tho4/servlets/ReserveringAanmakenServlet.java