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

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

THE LAST UPDATE