project edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	student/app/development/projectEdit.php
<<<head weggehaald