Conflicto de merge
Merge branch 'master' of https://github.com/lamgrupo/WSLam

Conflicts:
	build/generated-sources/ap-source-output/com/lam/entidades/caja/com/lam/ws/caja/SociosMovimientosPK_.java
	build/generated-sources/ap-source-output/com/lam/entidades/caja/com/lam/ws/caja/SociosMovimientos_.java
	build/generated-sources/ap-source-output/com/lam/entidades/caja/com/lam/ws/caja/SociosSaldosDiariosPK_.java
	build/generated-sources/ap-source-output/com/lam/entidades/caja/com/lam/ws/caja/SociosSaldosDiarios_.java
	build/generated-sources/ap-source-output/com/lam/entidades/cenicco/com/lam/ws/cenicco/TimbreRecibo_.java
	build/generated-sources/ap-source-output/com/lam/entidades/cenicco/com/lam/ws/cenicco/Usuario_.java
	build/generated-sources/ap-source-output/com/lam/entidades/com/lam/ws/carestream/CalendarioProceso_.java
	build/generated-sources/ap-source-output/com/lam/entidades/com/lam/ws/carestream/CfdiRecibo_.java
	build/generated-sources/ap-source-output/com/lam/entidades/com/lam/ws/carestream/ClaseNomina_.java
	build/generated-sources/ap-source-output/com/lam/entidades/com/lam/ws/carestream/ListadoRecibosCfdi_.java
	build/generated-sources/ap-source-output/com/lam/entidades/com/lam/ws/carestream/TipoNomina_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/AcumuladoConcepto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/AdelantoVacaciones_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Asentamiento_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Banco_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/CatalogoConcepto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/CatalogoGeneral_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/CatalogoGrupoConcepto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/CatalogoGrupoPension_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Ciudad_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/ColumnaTabulador_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Compania_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/ConceptoLista_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Concepto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/ConfiguracionVacaciones_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Contacto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/CuentaBancaria_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Departamento_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Documento_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Domicilio_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Empleado_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Estado_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/EstructuraColumna_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/EstructuraDatos_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/EstructuraLista_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/EstructuraRelacion_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Estructura_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Formula_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/GrupoConcepto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/GrupoPago_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Incidencia_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/InfonavitHistorico_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Infonavit_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Municipio_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Pais_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Pension_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Periodo_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Poliza_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/PosicionSueldoHistorico_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/PosicionSueldo_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Puesto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/RegistroPatronal_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/RelacionLaboralPosicion_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/RelacionLaboral_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/SaldoVacaciones_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/SistemaAntiguedad_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/SolicitudVacaciones_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/TabuladorSistemaAntiguedad_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/TipoAsentamiento_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/TipoContacto_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/TipoDocumento_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/TipoProceso_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/TipoRelacionLaboral_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/TipoSueldo_.java
	build/generated-sources/ap-source-output/com/lam/entidades/servicio/com/lam/ws/lam/Turno_.java
	dist/WSLam.jar