Merge branch 'Francisco' of https://github.com/eduardonalves/lifecare into Henrique
Merge branch 'Henrique'