atualizacao
Merge branch 'master_devel' of github.com:sikora/acao into master_devel