dsfas
fdsaMerge branch 'master' of https://github.com/prakhar1989/researchportal

Conflicts:
	application/controllers/Conf_facultyApp.php
	application/controllers/Conf_facultypending.php
	application/controllers/Conf_show.php
	application/models/conference_model.php
fasdf
fdsaf