Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.java
Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.form
	src/Interface/GUI_Principal.java
Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.form
	src/Interface/GUI_Principal.java
Merge origin/master

Conflicts:
	src/Interface/GUI_Principal.form
	src/Interface/GUI_Principal.java
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Revert "Merge origin/master"

This reverts commit 264ac56a01f7ae04172739d2fe272df96a0ec6b9.
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Merge origin/master

Conflicts:
	src/Clases_Auxiliares/Conexion.java
	src/Contabilidad/GUI_Imprimir_Mayor.java
Merge origin/master