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

Conflicts:
	student/app/development/addProject.php
	student/app/development/projectEdit.php