Merge origin/temp2

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/Facturacion/GUI_Imprimir_Comprobantes.form
	src/Facturacion/GUI_Imprimir_Comprobantes.java
	src/Facturacion/IGUI_Asignar_Pto_Venta_Comprobante.java
	src/Facturacion/IGUI_Facturar.form
	src/Facturacion/IGUI_Facturar.java
	src/Facturacion/IGUI_Productos.form
	src/Facturacion/IGUI_Productos.java
Merge origin/temp2

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/Facturacion/GUI_Imprimir_Comprobantes.form
	src/Facturacion/GUI_Imprimir_Comprobantes.java
	src/Facturacion/IGUI_Asignar_Pto_Venta_Comprobante.java
	src/Facturacion/IGUI_Facturar.form
	src/Facturacion/IGUI_Facturar.java
	src/Facturacion/IGUI_Productos.form
	src/Facturacion/IGUI_Productos.java
Merge origin/temp2

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/Facturacion/GUI_Imprimir_Comprobantes.form
	src/Facturacion/GUI_Imprimir_Comprobantes.java
	src/Facturacion/IGUI_Asignar_Pto_Venta_Comprobante.java
	src/Facturacion/IGUI_Facturar.form
	src/Facturacion/IGUI_Facturar.java
	src/Facturacion/IGUI_Productos.form
	src/Facturacion/IGUI_Productos.java
Merge origin/temp2

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/Facturacion/GUI_Imprimir_Comprobantes.form
	src/Facturacion/GUI_Imprimir_Comprobantes.java
	src/Facturacion/IGUI_Asignar_Pto_Venta_Comprobante.java
	src/Facturacion/IGUI_Facturar.form
	src/Facturacion/IGUI_Facturar.java
	src/Facturacion/IGUI_Productos.form
	src/Facturacion/IGUI_Productos.java
Merge origin/help

Conflicts:
	SQLQuery_Load_DB_Empresa.sql
Merge origin/help

Conflicts:
	SQLQuery_Load_DB_Empresa.sql
Merge origin/help

Conflicts:
	SQLQuery_Load_DB_Empresa.sql