finalizando
Merge branch 'master' of github.com:humbertocruz/nobrega

Conflicts:
	app/Plugin/Admin/Controller/AdminAppController.php
	app/Plugin/Admin/Controller/UsuariosController.php