commit final
Merge remote-tracking branch 'origin/novaRamificacao' into novaRamificacao

Conflicts:
	nbproject/project.properties