Máscarado do CFP
Merge branch 'master' of https://github.com/gustavobhweb/izabela

Conflicts:
	app/Config/routes.php
	app/Controller/UsersController.php
	app/Controller/UsuariosController.php
	app/View/Layouts/default.ctp
	app/View/Users/login.ctp