Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/entities/Paciente.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Rol.java
	GCamas-ejb/src/main/java/cl/hblt/entities/TrasladoTemporal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-web/src/main/java/cl/hblt/beans/loginBean.java
	GCamas-web/src/main/webapp/Application/TTemporal/TTemporales.xhtml
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/entities/Paciente.java
	GCamas-ejb/src/main/java/cl/hblt/entities/Rol.java
	GCamas-ejb/src/main/java/cl/hblt/entities/TrasladoTemporal.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-web/src/main/java/cl/hblt/beans/loginBean.java
	GCamas-web/src/main/webapp/Application/TTemporal/TTemporales.xhtml
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-ejb/src/main/resources/META-INF/persistence.xml
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-ejb/src/main/resources/META-INF/persistence.xml
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacadeLocal.java
	GCamas-ejb/src/main/resources/META-INF/persistence.xml