Cabecalho e comentarios gerais, doxygen ready
correção de conflitos
Merge branch 'develop' of https://github.com/BecoSystems/macaco001 into develop