resolucao do conflito
Merge branch 'master' of http://github.com/GUDDI/docs.git
Remocao teste