asoiduasio
cinflito
Merge branch 'develop' into issue#9999

Conflicts:
	arquivotal.txt