vanalles wat
Merge branch 'master' of https://github.com/Onomanatee/project_JOETZ

Conflicts:
	client/webapp/app/views/monitoractiviteiten.html