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

Conflicts:
	BOSistemaFaturamento/nbproject/private/private.xml
	CamadaWeb/nbproject/private/private.properties
	CamadaWeb/nbproject/private/private.xml
	MyServicosGeral/nbproject/private/private.xml