chega de commits...
Merge ProjetoTr2/master

Conflicts:
	build.xml
	web/index.html