faculty controller??
Merge branch 'master' of https://github.com/pchaow/SuccessModel

Conflicts:
	public/js/controllers/FacultyController.js
fix ResearchProjectApiController
change PersonInCharge to InCharge in ResearchProject model