projectSubmit Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	fileupload/submitProject.php