Hoop dat alles goed jkomt
Merge branch 'master' of https://github.com/utwente-di/di04.git

Conflicts:
	kunstmenu/src/main/webapp/AddActivity.jsp
	kunstmenu/src/main/webapp/ChangeActivity.jsp
	kunstmenu/src/main/webapp/css/reserveren.css