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

Conflicts:
	application/controllers/ShowArchiveConf.php