atualizacao1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zfproject.xml
Merge branch 'master' of https://github.com/matheusantos/TM-Estimates