"Fix Lib"
Merge branch 'master' of github.com:vchibilisco/SIG-MODULO-Venta

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	src/db/servicios/Conexion_DB.java