agregar cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/java/edu/quipu/rrhh/controllers/PlanillaCASController.java
	src/main/java/edu/quipu/rrhh/controllers/PlanillasCASController.java
	src/main/java/edu/quipu/rrhh/models/vacacionestruncas.java
	src/main/java/edu/quipu/rrhh/persistence/PlanillaCASMapper.java
	src/main/java/edu/quipu/rrhh/persistence/VacacionesTruncasMapper.java
	src/main/java/edu/quipu/rrhh/services/PlanillaCASService.java
	src/main/java/edu/quipu/rrhh/services/implement/PlanillaCASServiceImpl.java
	src/main/webapp/WEB-INF/resources/css/vendor/quipucamayoc.css
	src/main/webapp/WEB-INF/resources/js/apps/planillas/list/list_Layout.js
	src/main/webapp/WEB-INF/resources/js/apps/planillas/list/templates/planillasLayout.hbs
	src/main/webapp/WEB-INF/resources/js/apps/planillas/list/view/planillaView.js
	src/main/webapp/WEB-INF/resources/js/apps/vacaciones_truncas/form/form_layout.js
	src/main/webapp/WEB-INF/resources/js/apps/vacaciones_truncas/form/templates/inicio_vacaciones_truncas.hbs
	src/main/webapp/WEB-INF/resources/js/apps/vacaciones_truncas/form/templates/list_serv.hbs
la parte de jean esta mal