Hooks and things
Merge branch 'master' of https://github.com/frosoco/frosoco

Conflicts:
	application/config/autoload.php