Abstract part was done
Merge branch 'resumo'

Conflicts:
	articles/cbsoft/mezuro.tex