Updte by Mawin~
Merge branch 'master' of https://github.com/movalen/graduate_web

Conflicts:
	application/config/database.php
a