'generacion y carga de plantilla, con saldos de las cuentas'
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/AsientoContable.java
	src/main/java/com/ts/libraries/CatalogoContable/Ventas.java
	src/main/java/com/ts/libraries/Compania.java
	src/main/java/com/ts/libraries/CuentaBancaria.java
Merge branch 'origin/master'
'Merge branch 'origin/master'