update
Merge branch 'master' of https://github.com/iYottt/graduatenew

Conflicts:
	application/modules/setting/controllers/imports.php
Merge branch 'master' of https://github.com/iYottt/graduatenew