Updating readme
Merge branch 'hotfix/conversion-track' into develop
Fixing master conflicts
Merge branch 'master' into develop
finalizacao da internacionalizacao
ajustando link do manguezal no rodape