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

Conflicts:
	application/modules/setting/controllers/cause_end.php
	application/modules/setting/views/cause_end/form.php