Conserta A
Merge branch 'hotfix'
Merge branch 'master' into devel
Finaliza desenvolvimento B