alterações feitas
Merge branch 'master' of https://github.com/eduardonalves/lifecare into Henrique

Conflicts:
	app/View/Contas/view.ctp
Comited