Alterações Users
Merge branch 'master' of https://github.com/eduardonalves/lifecare into Lucas

Conflicts:
	app/View/Users/add.ctp
Merge branch 'Lucas'