Fixed small issues
Merge branch 'master' of https://github.com/utwente-di/di04

Conflicts:
	kunstmenu/src/main/webapp/ViewActivity.jsp
	kunstmenu/src/main/webapp/backoffice/AddActivity.jsp