Merge pull request #176 from guestisp/master

Sync and Test the Guestisp code
Some bug fixed
obsolete code deleted
Merge branch 'shineisp/sandbox'

Conflicts:
	application/models/Settings.php
	application/modules/default/Bootstrap.php
	library/Shineisp/Controller/Plugin/SetupModules.php