mais algumas mudanças
Merge remote-tracking branch 'origin/master'

Conflicts:
	CamadaWeb/nbproject/private/private.properties
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 230384ff45d46090d072d015284e3d0b8d70eb4e.