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