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

Conflicts:
	application/modules/home/controllers/admin/gallery.php
a