Implemented "Wijzig activiteit"
Merge branch 'master' of https://github.com/utwente-di/di04.git

Conflicts:
	kunstmenu/src/main/webapp/index.jsp