Comiteo
Comiteo
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/entities/AsignacionCama.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Cama.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Cargo.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Especialidad.java
	GCamas-ejb/src/main/java/cl/hblt/entities/EstadoPaciente.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Parentesco.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Prevision.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Sala.java
	GCamas-ejb/src/main/java/cl/hblt/entities/TipoCama.java
	GCamas-ejb/src/main/java/cl/hblt/entities/TipoPrevision.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/EstadoPacienteFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/EstadoPacienteFacadeLocal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/PrevisionFacadeLocal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/TipoCamaFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/TipoCamaFacadeLocal.java
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/entities/AsignacionCama.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Cama.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Cargo.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Especialidad.java
	GCamas-ejb/src/main/java/cl/hblt/entities/EstadoPaciente.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Parentesco.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Prevision.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Sala.java
	GCamas-ejb/src/main/java/cl/hblt/entities/TipoCama.java
	GCamas-ejb/src/main/java/cl/hblt/entities/TipoPrevision.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/EstadoPacienteFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/EstadoPacienteFacadeLocal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/PrevisionFacadeLocal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/TipoCamaFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/TipoCamaFacadeLocal.java
Merge origin/master