Merge branch 'master' of https://github.com/jeffreyzant/ICT-Beheer

Conflicts:
	view/incidentmanagement/incidentmanagement.edit.php