Merge origin/master

Conflicts:
	lib/nblibraries.properties
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	setup/glassfish-resources.xml
	src/java/br/edu/ifsul/controle/ControleVenda.java