Merge branch 'master' of https://github.com/dejesus2010/CEN3031Project

Conflicts:
	mean/app/controllers/projects.server.controller.js
Merge branch 'master' of https://github.com/dejesus2010/CEN3031Project