fdsa
Merge remote-tracking branch 'origin/master'

Conflicts:
	BOGeral/build/built-jar.properties
	BOGeral/dist/BOGeral.jar
	CamadaWeb/build/web/WEB-INF/lib/BOGeral.jar
	CamadaWeb/build/web/WEB-INF/lib/MyInfra.jar
	CamadaWeb/build/web/WEB-INF/lib/MyServicosGeral.jar
	CamadaWeb/build/web/WEB-INF/lib/MySistemaFaturamento.jar
	MyInfra/build/built-jar.properties
	MyInfra/dist/MyInfra.jar
	MyInfra/dist/lib/BOGeral.jar
	MyServicosGeral/build/built-jar.properties
	MyServicosGeral/dist/MyServicosGeral.jar
	MyServicosGeral/dist/lib/BOGeral.jar
	MyServicosGeral/dist/lib/MyInfra.jar