Atualizei varias coisas
Merge branch 'master' of https://github.com/Vascomfortuna/Eng-Soft-2