Merge branch 'master' of https://github.com/valdirluiz/guia-online

Conflicts:
	application/core/MY_Loader.php