...
Merge branch 'master' of https://github.com/gustavobhweb/izabela_hendrix

Conflicts:
	application/controllers/home.php