.jar properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	BOGeral/build/built-jar.properties
	MyInfra/build/built-jar.properties
	MyServicosGeral/build/built-jar.properties