"Conbinacion proyecto Parser"
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/libraries/Activo.java
	src/main/java/com/ts/libraries/Agua.java
	src/main/java/com/ts/libraries/Alquiler.java
	src/main/java/com/ts/libraries/AsientoContable.java
	src/main/java/com/ts/libraries/AsignacionLaboral.java
	src/main/java/com/ts/libraries/Banco.java
	src/main/java/com/ts/libraries/Capacitacion.java
	src/main/java/com/ts/libraries/CentroDeCostos.java
	src/main/java/com/ts/libraries/Colaborador.java
	src/main/java/com/ts/libraries/Compania.java
	src/main/java/com/ts/libraries/CuentaContable.java
	src/main/java/com/ts/libraries/CuentaDeAguinaldo.java
	src/main/java/com/ts/libraries/CuentaDeBanco.java
	src/main/java/com/ts/libraries/Edificio.java
	src/main/java/com/ts/libraries/Electricidad.java
	src/main/java/com/ts/libraries/Gasto.java
	src/main/java/com/ts/libraries/GastoAdministrativo.java
	src/main/java/com/ts/libraries/HorasExtras.java
	src/main/java/com/ts/libraries/Incapacidad.java
	src/main/java/com/ts/libraries/Internet.java
	src/main/java/com/ts/libraries/Materiales.java
	src/main/java/com/ts/libraries/MovimientoContable.java
	src/main/java/com/ts/libraries/Pago.java
	src/main/java/com/ts/libraries/Proyecto.java
	src/main/java/com/ts/libraries/ServicioDeApoyo.java