"Depreciaciones US 34, 35, 36, 37, 38, 40, 41, incapacidades enfermedad, maternidad"
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/ts/interprete/Parser.java
	src/main/java/com/ts/libraries/AsignacionLaboral.java
	src/main/java/com/ts/libraries/Colaborador.java
	src/main/java/com/ts/libraries/Compania.java
	src/main/java/com/ts/libraries/Decimal.java
	src/main/java/com/ts/libraries/Fecha.java
	src/main/java/com/ts/libraries/FechaHora.java
	src/main/java/com/ts/libraries/Hilera.java
	src/main/java/com/ts/libraries/Materiales.java
	src/main/java/com/ts/libraries/Mes.java
	src/main/java/com/ts/libraries/Numero.java
	src/main/java/com/ts/libraries/PagablePlanilla.java
	src/main/java/com/ts/libraries/Pago.java
	src/main/java/com/ts/libraries/Proyecto.java
	src/main/java/com/ts/main/Sistema.java
	src/test/java/com/ts/main/Comandos.java
	src/test/java/com/ts/main/InterpreteComandos.java