...
Merge branch 'master' of https://github.com/dangquanglight/LightProject

Conflicts:
	application/core/GEH_Controller.php
	application/views/control/index.php