changes
Merge branch 'master' of https://github.com/prakhar1989/researchportal

Conflicts:
	application/controllers/FacultyProjShowDetails.php
	application/controllers/ongoing.php
	application/controllers/printfile.php