sync with server
sync
Merge branch 'master' of https://github.com/prakhar1989/researchportal

Conflicts:
	application/controllers/facultyProjApp.php