bv30
Merge branch 'master' of https://github.com/iYottt/graduate
Merge branch 'master' of https://github.com/iYottt/graduate
bv31,32,33
Merge branch 'master' of https://github.com/iYottt/graduate

Conflicts:
	application/config/database.php