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

Conflicts:
	application/modules/setting/views/grade/form.php
Merge branch 'master' of https://github.com/iYottt/graduate
Merge branch 'master' of https://github.com/iYottt/graduate
Merge branch 'master' of https://github.com/iYottt/graduate
Merge branch 'master' of https://github.com/iYottt/graduate
Merge branch 'master' of https://github.com/iYottt/graduate
...