Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
Merge origin/master

Conflicts:
	GCamas-ejb/src/main/java/cl/hblt/sessions/BussinessFacade.java
Merge origin/master

Conflicts:
	GCamas-web/src/main/java/cl/hblt/beans/pacientesBean.java
	GCamas-web/src/main/webapp/Mantenedores/Pacientes/PacienteUpdate.xhtml
	GCamas-web/src/main/webapp/Mantenedores/Pacientes/Pacientes.xhtml
	GCamas-web/src/main/webapp/Mantenedores/RegistrosHospitalizados/PacientesHospitalizados.xhtml
	GCamas-web/src/main/webapp/Mantenedores/RegistrosHospitalizados/RegistrarHospitalizacion.xhtml
	GCamas-web/src/main/webapp/Template.xhtml