admin laten werken en cleanup
Merge branch 'development' into Jeroen

Conflicts:
	index.php