VSF GIT
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controle de Qualidade/nbproject/private/private.xml