diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efdcca8..cc7dcfe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ ci_build:
   script:
     - cd 1.sources/MyHealth
     - ant clean
-    - ant all
+    - ant ear
 
 ci_test:
   stage: test
@@ -25,9 +25,12 @@ ci_test:
 deploy_pre:
   stage: deploy
   script:
+    - echo "Eliminamos archivo ear anterior..."
+    - rm -f $JBOSS_HOME/standalone/deployments/MyHealth.*
     - echo "Despliegue al servidor de PRE"
     - cd 1.sources/MyHealth
     - ant deployear
+    
 
   environment:
     name: pre
@@ -38,6 +41,8 @@ deploy_pre:
 deploy_pro:
   stage: deploy
   script:
+    - echo "Eliminamos archivo ear anterior..."
+    - rm -f $JBOSS_HOME/standalone/deployments/MyHealth.*
     - echo "Despliegue al servidor de PRO"
     - cd 1.sources/MyHealth
     - ant deployear
diff --git a/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs b/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs
index 2c1391e..5caa538 100644
--- a/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs
+++ b/1.sources/MyHealth/.settings/org.eclipse.jdt.core.prefs
@@ -1,13 +1,13 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/1.sources/MyHealth/build.xml b/1.sources/MyHealth/build.xml
index a970c24..2210832 100644
--- a/1.sources/MyHealth/build.xml
+++ b/1.sources/MyHealth/build.xml
@@ -4,8 +4,9 @@
 
 	<!-- definition of global property -->
 	<property environment="env" />
-	<property name="jboss.home" value="/opt/wildfly" />
+	<property name="jboss.home" value="${env.JBOSS_HOME}" />
 	<property name="source" value="." />
+	<property name="java.encoding" value="UTF-8" />
 	<property name="sourcesrc" value="${source}/src" />
 	<property name="build" value="${source}/build" />
 	<property name="buildjar" value="${build}/jar" />
@@ -48,7 +49,17 @@
 	<target name="compileEjb" depends="init">
 		<copy file="${sourcesrc}/META-INF/persistence.xml" todir="${buildjar}/META-INF" />
 		<copy file="${sourcesrc}/log4j.properties" todir="${buildjar}" />
-		<javac srcdir="${sourcesrc}" destdir="${buildjar}" includes="ejb/**/*.java, jpa/**/*.java, TO/**/*.java, common/**/*.java" classpathref="jboss.classpath" includeantruntime="true" />
+		<javac encoding="${java.encoding}" srcdir="${sourcesrc}" destdir="${buildjar}" includeantruntime="true" source="1.8" target="1.8">
+			<classpath>
+				<path refid="jboss.classpath" />
+			</classpath>
+			<include name="ejb/**/*.java" />
+			<include name="jpa/**/*.java" />
+			<include name="TO/**/*.java" />
+			<include name="common/**/*.java" />
+			<exclude name="managedbean/**/*.java" />
+		</javac>
+		<delete verbose="true" dir="${buildjar}/managedbean" />
 	</target>
 
 	<!-- Update the EJB jar file and create if not exist -->
@@ -61,17 +72,22 @@
 		<copy todir="${buildwar}">
 			<fileset dir="${docroot}" />
 		</copy>
-		<javac srcdir="${sourcesrc}" destdir="${buildwar}/WEB-INF/classes" includes="managedbean/**/*.java" includeantruntime="true">
+		<javac encoding="${java.encoding}" srcdir="${sourcesrc}" destdir="${buildwar}/WEB-INF/classes" includeantruntime="true" source="1.8" target="1.8">
 			<classpath>
 				<path refid="jboss.classpath" />
 				<path refid="lib.dir" />
 			</classpath>
+			<include name="managedbean/**/*.java" />
+			<exclude name="ejb/**/*.java" />
+			<exclude name="jpa/**/*.java" />
+			<exclude name="TO/**/*.java" />
+			<exclude name="common/**/*.java" />
 		</javac>
 		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/ejb" />
 		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/jpa" />
 		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/TO" />
 		<delete verbose="true" dir="${buildwar}/WEB-INF/classes/common" />
-			</target>
+	</target>
 	<!-- <war destfile="${build.dir}/CrunchifyRESTJerseyExample.war" webxml="WebContent/WEB-INF/web.xml"> -->
 	<!-- <classes dir="${build.dir}" /> -->
 	<!-- <lib dir="${lib.dir}"> -->
@@ -80,7 +96,8 @@
 
 	<!-- Update the WAR file and create if not exist -->
 	<target name="deployWar" depends="compileWar">
-		<jar jarfile="${dist}/MyHealth.war" basedir="${buildwar}" excludes="/WEB-INF/classes/ejb/*.*, /WEB-INF/classes/jpa/*.*, /WEB-INF/classes/TO/*.*, /WEB-INF/classes/common/*.*" update="yes" />
+		<jar jarfile="${dist}/MyHealth.war" basedir="${buildwar}" excludes="/WEB-INF/classes/ejb/*.*, /WEB-INF/classes/jpa/*.*, /WEB-INF/classes/TO/*.*, /WEB-INF/classes/common/*.*"
+			update="yes" />
 	</target>
 
 	<!-- Update the application ear file and created if not exist -->
@@ -88,11 +105,12 @@
 		<copy file="${sourcesrc}/META-INF/application.xml" todir="${dist}/META-INF" />
 		<jar jarfile="${dist}/MyHealth.ear" basedir="${dist}" update="yes" />
 	</target>
-	
-	<target name="deployear" depends="ear" >
+
+	<!-- Deploy the ear. Copy the ear of the JBoss deployment directory -->
+	<target name="deployear" depends="ear">
 		<copy file="${dist}/MyHealth.ear" todir="${deploy}" />
 	</target>
-	
+
 	<!-- Clean the build directory -->
 	<target name="clean">
 		<antcall target="init" />
diff --git a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
index 1e39fd3..97f0d8b 100644
--- a/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
+++ b/1.sources/MyHealth/docroot/WEB-INF/faces-config.xml
@@ -2,4 +2,7 @@
 <faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd" version="2.3">
 
+	<factory>
+		<exception-handler-factory>org.omnifaces.exceptionhandler.FullAjaxExceptionHandlerFactory</exception-handler-factory>
+	</factory>
 </faces-config>
diff --git a/1.sources/MyHealth/docroot/WEB-INF/web.xml b/1.sources/MyHealth/docroot/WEB-INF/web.xml
index f3dd3be..ee6d555 100644
--- a/1.sources/MyHealth/docroot/WEB-INF/web.xml
+++ b/1.sources/MyHealth/docroot/WEB-INF/web.xml
@@ -18,7 +18,10 @@
 		<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
 		<param-value>true</param-value>
 	</context-param>
-
+	<context-param>
+		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+		<param-value>client</param-value>
+	</context-param>
 	<context-param>
 		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
 		<param-value>.xhtml</param-value>
@@ -27,8 +30,6 @@
 		<param-name>primefaces.FONT_AWESOME</param-name>
 		<param-value>true</param-value>
 	</context-param>
-
-
 	<context-param>
 		<param-name>primefaces.THEME</param-name>
 		<param-value>#{sessionPreferences.currentTheme}</param-value>
@@ -42,36 +43,59 @@
 	</servlet>
 
 	<!-- Map these files with JSF -->
-	<servlet-mapping>
-		<servlet-name>Faces Servlet</servlet-name>
-		<url-pattern>/faces/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>Faces Servlet</servlet-name>
-		<url-pattern>*.jsf</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>Faces Servlet</servlet-name>
-		<url-pattern>*.faces</url-pattern>
-	</servlet-mapping>
 	<servlet-mapping>
 		<servlet-name>Faces Servlet</servlet-name>
 		<url-pattern>*.xhtml</url-pattern>
 	</servlet-mapping>
 
+	<!-- Filters -->
+	<filter>
+		<filter-name>facesExceptionFilter</filter-name>
+		<filter-class>org.omnifaces.filter.FacesExceptionFilter</filter-class>
+	</filter>
+
+	<!-- Filter mappings -->
+	<filter-mapping>
+		<filter-name>facesExceptionFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<!-- Error pages mapping -->
+	<error-page>
+		<exception-type>javax.faces.application.ViewExpiredException</exception-type>
+		<location>/error.xhtml?type=expired</location>
+	</error-page>
+	<error-page>
+		<exception-type>java.sql.SQLException</exception-type>
+		<exception-type>org.hibernate.exception.GenericJDBCException</exception-type>
+		<exception-type>java.net.ConnectException</exception-type>
+		<exception-type>javax.persistence.PersistenceException</exception-type>
+		<location>/error.xhtml?type=sql</location>
+	</error-page>
+	<error-page>
+		<exception-type>javax.persistence.PersistenceException</exception-type>
+		<location>/error.xhtml?type=runtime</location>
+	</error-page>
+	<error-page>
+		<exception-type>java.net.ConnectException</exception-type>
+		<location>/error.xhtml?type=sql</location>
+	</error-page>
 	<error-page>
 		<error-code>500</error-code>
 		<location>/error.xhtml</location>
 	</error-page>
+	<error-page>
+		<error-code>401</error-code>
+		<location>/error.xhtml?type=expired</location>
+	</error-page>
 
 	<session-config>
 		<session-timeout>30</session-timeout>
-
 	</session-config>
 
 	<!-- The Welcome File List -->
 	<welcome-file-list>
-		<welcome-file>home.xhtml</welcome-file>
+		<welcome-file>/home.xhtml</welcome-file>
 	</welcome-file-list>
 
 </web-app>
diff --git a/1.sources/MyHealth/docroot/error.xhtml b/1.sources/MyHealth/docroot/error.xhtml
index e961f1d..c86f3f3 100644
--- a/1.sources/MyHealth/docroot/error.xhtml
+++ b/1.sources/MyHealth/docroot/error.xhtml
@@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 
 <ui:composition template="./header.xhtml">
 	<ui:define name="content">
@@ -12,16 +12,23 @@
 				<div class="ui-g-8 ui-md-8">
 					<p:panel id="ErrorPanel">
 						<f:facet name="header">
-							<p:outputLabel value="Se ha producido un error de autorización" rendered="#{param.type == 'auth'}" />
-							<p:outputLabel value="Se ha producido un error desconocido" rendered="#{param.type == null}" />
+							<p:outputLabel rendered="#{param.type == 'sql'}" value="No se puede conectar con la base de datos" />
+							<p:outputLabel rendered="#{param.type == 'auth'}" value="Se ha producido un error de autorización" />
+							<p:outputLabel rendered="#{param.type == 'expired'}" value="Su sesión ha caducado" />
+							<p:outputLabel rendered="#{param.type == 'runtime'}" value="Se producido un error en tiempo de ejecución" />
+							<p:outputLabel rendered="#{param.type == '' or param.type == null}" value="Se ha producido un error desconocido" />
 						</f:facet>
 						<div class="ui-g ui-fluid">
-							<div class="ui-g-12">La acción que estaba realizando a causado un error inesperado en el sistema. A continuación podrá ver un descripción detallada del error para que
-								pueda comunicarlo al equipo de soporte.</div>
-
-							<div class="ui-g-12" style="font-weight: bold;">
-								<!-- 								<p:outputLabel value="No está autorizado a acceder a la página solicitada. Por favor, utilice el menú principal de la aplicación." rendered="#{param.type == 'auth'}" /> -->
-								<!-- 								<p:outputLabel value="Se ha producido un error desconocido. Si vuelve a repetirse, por favor, contacte con el equipo de soporte." rendered="#{param.type == null}" /> -->
+							<div class="ui-g-12">
+								<p:outputLabel rendered="#{param.type == 'sql'}"
+									value="No ha sido posible realizar una conexión con el servidor de base de datos subyante, o ha ocurrido un error grave cuando se intentaba realizar la conexión. Por favor contacte con el equipo de soporte." />
+								<p:outputLabel rendered="#{param.type == 'auth'}"
+									value="No está autorizado a ver la url consultada. Por favor, vaya a la página principal y utilice el menú de la aplicación para acceder las funcionalidades disponibles." />
+								<p:outputLabel rendered="#{param.type == 'expired'}" value="Su sesión ha caducado. Por favor, incie sesión de nuevo en el sistema." />
+								<p:outputLabel rendered="#{param.type == 'runtime'}"
+									value="Se ha producido un error en el servidor durante la ejecución de la última acción. Por favor, intentelo de nuevo o contacte con el equipo de soporte." />
+								<p:outputLabel rendered="#{param.type == '' or param.type == null}"
+									value="La acción que estaba realizando a causado un error inesperado en el sistema. A continuación podrá ver un descripción detallada del error para que pueda comunicarlo al equipo de soporte." />
 							</div>
 
 							<div class="ui-g-12">
diff --git a/1.sources/MyHealth/docroot/header.xhtml b/1.sources/MyHealth/docroot/header.xhtml
index 2e76837..5ad7f6d 100644
--- a/1.sources/MyHealth/docroot/header.xhtml
+++ b/1.sources/MyHealth/docroot/header.xhtml
@@ -2,45 +2,35 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 
 <h:head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>MyHealth Online Services</title>
 	<h:outputStylesheet name="primeicons/primeicons.css" library="primefaces" />
 	<h:outputStylesheet library="css" name="estilos.css" />
+	<h:outputScript library="js" name="common.js" />
 </h:head>
 <h:outputScript>
-	    function handleLoginRequest(xhr, status, args) {
-	        if(args.validationFailed || !args.loggedIn) {
-	            PF('dlgLogin').jq.effect("shake", {times:5}, 100);
-	            //PF('Login').attr("disabled", false);
-	        }
-	        else {
-	            PF('dlgLogin').hide();
-	        }
-	    }
-	    
-	    function startLogin() {
-	    	//PF('Login').attr("disabled", true);
-	    }
+	// Si hay un error AJAX, lo más probable es que la sesión expirase, vamos a la página de error
+	function onAjaxError() {
+		window.location.href = "#{request.contextPath}/error.xhtml?type=expired";
+	}
 </h:outputScript>
 <h:body>
+	<p:growl id="messages" globalOnly="true" sticky="false" showDetail="true" life="15000" />
 	<div id="layout">
 		<div id="top" class="top">
-			<!-- 			<h1 class="Titulo">myHealth Site</h1> -->
 			<h:graphicImage library="images" name="logo-small.png" />
 		</div>
-		<hr />
-		<div id="menuDiv">
-			<p:growl id="messages" globalOnly="true" sticky="false" showDetail="true" life="15000" />
-			<p:ajaxStatus style="width:32px; height:32px; position:fixed; right:32px; bottom:32px">
+		<div id="menuDiv" style="margin-bottom: 10px;">
+			<p:ajaxStatus style="width:32px; height:32px; position:fixed; right:32px; bottom:32px" onerror="onAjaxError()">
 				<f:facet name="start">
-					<i id="loginSpin" class="pi pi-spin pi-spinner" style="font-size: 3em"></i>
+					<i id="loginSpin" class="pi pi-spin pi-spinner" style="font-size: 3em" />
 				</f:facet>
 
-				<f:facet name="complete">
-					<h:outputText value="" />
+				<f:facet name="error">
+					<i class="pi pi-exclamation-triangle" style="font-size: 3em" />
 				</f:facet>
 			</p:ajaxStatus>
 
@@ -49,15 +39,15 @@
 					<div class="ui-g ui-fluid">
 						<div class="ui-g-12">
 							<h:outputLabel for="username" value="Usuario:" />
-							<p:inputText id="username" value="#{loginView.username}" />
+							<p:inputText id="username" value="#{loginView.username}" placeholder="Escriba su código CIP o NP" />
 						</div>
 						<div class="ui-g-12">
 
 							<h:outputLabel for="password" value="Contraseña:" />
-							<p:password id="password" value="#{loginView.password}" />
+							<p:password id="password" value="#{loginView.password}" placeholder="Contraseña" />
 						</div>
 						<div class="ui-g-6">
-							<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
+							<p:commandButton widgetVar="btnLogin" value="Login" update="messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()"
 								oncomplete="handleLoginRequest(xhr, status, args)" />
 						</div>
 						<div class="ui-g-6">
diff --git a/1.sources/MyHealth/docroot/home.xhtml b/1.sources/MyHealth/docroot/home.xhtml
index a4a0008..5d53f1a 100644
--- a/1.sources/MyHealth/docroot/home.xhtml
+++ b/1.sources/MyHealth/docroot/home.xhtml
@@ -2,44 +2,54 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
-<f:metadata>
-	<f:viewParam name="refresh" value="#{home.refresh}" />
-</f:metadata>
-
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 <ui:composition template="./header.xhtml">
 	<ui:define name="content">
 		<h:form>
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 			<p:panel header="Pagina principal">
-				<p:panelGrid>
-					<p:outputLabel for="selectorTema" value="Cambio de tema" />
-					<p:themeSwitcher id="selectorTema" style="width:165px" value="#{sessionPreferences.currentTheme}">
-						<f:selectItem itemLabel="Seleccione un tema" itemValue="" noSelectionOption="true" />
-						<f:selectItems value="#{home.themes}" var="theme" itemLabel="#{theme.displayName}" itemValue="#{theme.name}" />
-						<p:ajax listener="#{sessionPreferences.updateCurrentTheme}" />
-					</p:themeSwitcher>
-				</p:panelGrid>
-				<h:panelGrid columns="2">
-					<h:outputLabel value="Fecha" />
-					<p:calendar pattern="dd/MM/yyyy" />
-					<h:outputLabel value="Rich Text Editor" />
-					<p:editor />
-				</h:panelGrid>
-				<h:panelGroup>
-					<h:panelGrid columns="2">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+						<p:outputLabel for="selectorTema" value="Cambio de tema" />
+					</div>
+					<div class="ui-g-3 ui-md-3">
+						<p:themeSwitcher id="selectorTema" style="width:300px" value="#{sessionPreferences.currentTheme}">
+							<f:selectItem itemLabel="Seleccione un tema" itemValue="" noSelectionOption="true" />
+							<f:selectItems value="#{home.themes}" var="theme" itemLabel="#{theme.displayName}" itemValue="#{theme.name}" />
+							<p:ajax listener="#{sessionPreferences.updateCurrentTheme}" />
+						</p:themeSwitcher>
+					</div>
+					<div class="ui-g-2 ui-md-2">
+						<p:commandButton value="Usar tema en este sesión" update="mesgs" action="#{sessionPreferences.updateCurrentTheme}" icon="pi pi-save" />
+					</div>
+					<div class="ui-g-5 ui-md-5" />
+
+					<div class="ui-g-2 ui-md-2">
+						<div class="ui-inputgroup">
+							<p:calendar pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
+							<p:commandButton value="Fecha" />
+						</div>
+					</div>
+					<div class="ui-g-10 ui-md-10" />
+
+					<div class="ui-g-2 ui-md-2">
+						<h:outputLabel value="Fecha" />
+						<p:calendar pattern="dd/MM/yyyy" showButtonPanel="true" autocomplete="true" />
+					</div>
+					<div class="ui-g-10 ui-md-10" />
+					
+					<div class="ui-g-12">
+						<h:outputLabel value="Rich Text Editor" />
+					</div>
+					<div class="ui-g-12 ui-md-12">
+						<p:editor />
+					</div>
+
+					<div class="ui-g-12 ui-md-12">
 						<h:outputLabel value="Logeado como:" />
 						<p:inputText readonly="true" value="#{home.userName}" />
-					</h:panelGrid>
-				</h:panelGroup>
-			</p:panel>
-			<p:panel>
-				<h:panelGroup>
-					<h:panelGrid columns="1">
-						<p:commandButton value="Usar tema en este sesión" update="mesgs" action="#{sessionPreferences.updateCurrentTheme}" icon="pi pi-save" />
-					</h:panelGrid>
-				</h:panelGroup>
+					</div>
+				</div>
 			</p:panel>
 		</h:form>
 	</ui:define>
diff --git a/1.sources/MyHealth/docroot/login.xhtml b/1.sources/MyHealth/docroot/login.xhtml
index eb77bfa..84a37a8 100644
--- a/1.sources/MyHealth/docroot/login.xhtml
+++ b/1.sources/MyHealth/docroot/login.xhtml
@@ -2,24 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
-
-<h:head>
-	<title>login</title>
-</h:head>
-<h:outputScript>
-	<script type="text/javascript">
-    function handleLoginRequest(xhr, status, args) {
-        if(args.validationFailed || !args.loggedIn) {
-            PF('dlg').jq.effect("shake", {times:5}, 100);
-        }
-        else {
-            PF('dlg').hide();
-            $('#loginLink').fadeOut();
-        }
-    }
-	</script>
-</h:outputScript>
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 <ui:composition template="./header.xhtml">
 	<ui:define name="content">
 		<h:form>
diff --git a/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml b/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml
new file mode 100644
index 0000000..625f747
--- /dev/null
+++ b/1.sources/MyHealth/docroot/medicaltest/PendingQuestions.xhtml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui">
+
+<ui:composition template="../header.xhtml">
+	<ui:define name="content">
+		<h:form id="TestForm">
+			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:panel id="panelPendingQuestions" header="Listado de preguntas pendientes de respuesta">
+				<div class="ui-g ui-fluid">
+
+					<div class="ui-g-4 ui-md-4">
+						<p:outputLabel for="campo" value="Etiqueta para campo de formulario:" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo" value="Valor del campo del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:message for="campo" display="text" />
+					</div>
+
+					<div class="ui-g-4 ui-md-4">
+						<p:outputLabel for="campo2" value="Etiqueta para campo 2 de formulario:" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo2" value="Valor del campo 2 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:message for="campo" display="text" />
+					</div>
+
+					<div class="ui-g-4 ui-md-4">
+						<p:outputLabel for="campo3" value="Etiqueta para campo 3 de formulario:" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="campo3" value="Valor del campo 3 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:message for="campo" display="text" />
+					</div>
+
+					<p:dataTable widgetVar="dtPendingQuestions" var="qs" value="#{PendingQuestions.lazyDataModelQuestionList}" lazy="true" paginator="true" rows="10" paginatorPosition="bottom" paginatorAlwaysVisible="true"
+						paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,40">
+						<p:column headerText="Id" width="60px;">
+							<h:outputText value="#{qs.id}" />
+						</p:column>
+
+						<p:column headerText="Title" width="auto">
+							<h:outputText value="#{qs.title}"/>
+						</p:column>
+
+						<p:column headerText="Patient" width="auto">
+							<h:outputText value="#{qs.patient.displayName}" />
+						</p:column>
+
+						<p:column headerText="Status" width="90px;">
+							<h:outputText value="#{qs.status}" />
+						</p:column>
+						<p:column headerText="Acción" width="80px;">
+							<h:outputText value="Responder" />
+						</p:column>
+
+						<f:facet name="paginatorBottomLeft">
+							<p:commandButton type="button" icon="pi pi-refresh" onclick="PF('dtPendingQuestions').getPaginator().setPage(0);" />
+						</f:facet>
+					</p:dataTable>
+
+					<div class="ui-g-12 ui-g-nopad">
+						<div class="ui-g-4 ui-md-4" />
+						<div class="ui-g-2 ui-md-2 ">
+							<p:commandButton validateClient="true" value="Guardar" update="TestForm" action="#{PendingQuestions.saveData}" icon="pi pi-check" />
+						</div>
+						<div class="ui-g-2 ui-md-2">
+							<p:button value="Volver" outcome="/home" icon="pi pi-home" />
+						</div>
+						<div class="ui-g-4 ui-md-4" />
+					</div>
+				</div>
+			</p:panel>
+		</h:form>
+	</ui:define>
+</ui:composition>
+</html>
diff --git a/1.sources/MyHealth/docroot/menubar.xhtml b/1.sources/MyHealth/docroot/menubar.xhtml
deleted file mode 100644
index 2097408..0000000
--- a/1.sources/MyHealth/docroot/menubar.xhtml
+++ /dev/null
@@ -1,51 +0,0 @@
-<h:form>
-	<p:growl id="messages" />
-
-	<p:menubar>
-		<p:submenu label="File" icon="pi pi-file">
-			<p:submenu label="New" icon="pi pi-briefcase">
-				<p:menuitem value="Project" url="#" />
-				<p:menuitem value="Other" url="#" />
-			</p:submenu>
-			<p:menuitem value="Open" url="#" />
-			<p:separator />
-			<p:menuitem value="Quit" url="#" />
-		</p:submenu>
-
-		<p:submenu label="Edit" icon="pi pi-pencil">
-			<p:menuitem value="Undo" url="#" icon="pi pi-angle-double-left" />
-			<p:menuitem value="Redo" url="#" icon="pi pi-angle-double-right" />
-		</p:submenu>
-
-		<p:submenu label="Help" icon="pi pi-question">
-			<p:menuitem value="Contents" url="#" />
-			<p:submenu label="Search" icon="pi pi-search">
-				<p:submenu label="Text">
-					<p:menuitem value="Workspace" url="#" />
-				</p:submenu>
-				<p:menuitem value="File" url="#" />
-			</p:submenu>
-		</p:submenu>
-
-		<p:submenu label="Actions" icon="pi pi-cog">
-			<p:submenu label="Ajax" icon="pi pi-refresh">
-				<p:menuitem value="Save" action="#{menuView.save}" icon="pi pi-save"
-					update="messages" />
-				<p:menuitem value="Update" action="#{menuView.update}"
-					icon="pi pi-refresh" update="messages" />
-			</p:submenu>
-			<p:submenu label="Non-Ajax" icon="pi pi-clone">
-				<p:menuitem value="Delete" action="#{menuView.delete}"
-					icon="pi pi-times" update="messages" ajax="false" />
-			</p:submenu>
-		</p:submenu>
-
-		<p:menuitem value="Quit" url="http://www.primefaces.org"
-			icon="pi pi-times" />
-
-		<f:facet name="options">
-			<p:inputText style="margin:1px 10px 1px 1px;" placeholder="Search" />
-			<p:commandButton type="button" value="Logout" icon="pi pi-home" />
-		</f:facet>
-	</p:menubar>
-</h:form>
\ No newline at end of file
diff --git a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
index 497a814..c9c665d 100644
--- a/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangeFamilyDoctor.xhtml
@@ -7,7 +7,7 @@
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
 		<h:form id="frmChangeFD">
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 			<p:panel id="badProfile" rendered="#{not home.patient}">
 				<div class="ui-g-3 ui-md-3" />
 				<div class="ui-g-6 ui-md-6">
@@ -31,20 +31,21 @@
 			<p:panel id="PanelPHC" header="Cambiar médico de familia asignado" rendered="#{home.patient}">
 				<div class="ui-g ui-fluid">
 
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-2">
 						<p:outputLabel value="Médico de familia actualmente asignado:" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-4">
 						<p:outputLabel id="lblCurrentCenter" style="font-weight: bold;" value="#{ChangeFD.currentFamilyDoctor.displayName}" />
 					</div>
-					<div class="ui-g-4 ui-md-4" />
+					<div class="ui-g-6" />
 
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-2">
 						<p:outputLabel value="Nuevo médico de familia:" for="newFamilyDocAC" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-4">
 						<p:autoComplete id="newFamilyDocAC" dropdown="true" required="true" value="#{ChangeFD.newFamilyDoctor}" completeMethod="#{ChangeFD.completeFamilyDoctor}" var="fd"
-							itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia">
+							itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia"
+							placeholder="Seleccione su nuevo médico de familia o teclee para buscar...">
 							<o:converter converterId="omnifaces.ListConverter" list="#{ChangeFD.familyDoctorList}" />
 							<p:column headerText="Num. Prof.">
 								<h:outputText value="#{fd.professionalNumber}" />
@@ -57,7 +58,7 @@
 							</p:column>
 						</p:autoComplete>
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-6">
 						<p:message for="newFamilyDocAC" />
 					</div>
 
@@ -72,7 +73,6 @@
 						<div class="ui-g-4 ui-md-4" />
 					</div>
 				</div>
-
 			</p:panel>
 		</h:form>
 	</ui:define>
diff --git a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
index 712df92..03a1658 100644
--- a/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
+++ b/1.sources/MyHealth/docroot/profile/ChangePrimaryHealthCareCenter.xhtml
@@ -7,7 +7,7 @@
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
 		<h:form id="frmChangePHCC">
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 			<p:panel id="badProfile" rendered="#{not home.familyDoctor}">
 				<div class="ui-g-3 ui-md-3" />
 				<div class="ui-g-6 ui-md-6">
@@ -31,26 +31,31 @@
 			<p:panel id="PanelPHC" header="Cambiar centro de antención primaria asignado" rendered="#{home.familyDoctor}">
 				<div class="ui-g ui-fluid">
 
-					<div class="ui-g-4 ui-md-4">
-						<p:outputLabel value="Centro de antención primaria actualmente asignado:" />
+					<div class="ui-g-2">
+						<p:outputLabel value="Centro de antención primaria actual:" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-4">
 						<p:outputLabel id="lblCurrentCenter" style="font-weight: bold;" value="#{ChangeCAP.currentCenter.displayName}" />
 					</div>
-					<div class="ui-g-4 ui-md-4" />
+					<div class="ui-g-6" />
 
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-2">
 						<p:outputLabel value="Nuevo centro de atención primaria:" for="newCenter" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-4">
 						<p:autoComplete id="newCenter" dropdown="true" required="true" value="#{ChangeCAP.newCenter}" completeMethod="#{ChangeCAP.completePrimaryHealCareCenter}" var="phc"
-							itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria">
+							itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria"
+							placeholder="Seleccione una CAP o teclee para buscar...">
 							<o:converter converterId="omnifaces.ListConverter" list="#{ChangeCAP.phcList}" />
-							<p:column headerText="Nombre"><h:outputText value="#{phc.name}" /></p:column>
-							<p:column headerText="Localización"><h:outputText value="#{phc.location}" /></p:column>
-						</p:autoComplete>						
+							<p:column headerText="Nombre">
+								<h:outputText value="#{phc.name}" />
+							</p:column>
+							<p:column headerText="Localización">
+								<h:outputText value="#{phc.location}" />
+							</p:column>
+						</p:autoComplete>
 					</div>
-					<div class="ui-g-4 ui-md-4">
+					<div class="ui-g-6">
 						<p:message for="newCenter" />
 					</div>
 
diff --git a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
index 9965d46..6cd2a47 100644
--- a/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
+++ b/1.sources/MyHealth/docroot/profile/RegisterUser.xhtml
@@ -44,36 +44,18 @@
 			</h:form>
 
 			<h:form id="frmRegisterUser" rendered="#{not RegisterUser.registered}">
-				<h:outputScript>
-				    function handleRequest(xhr, status, args) {
-				    	/*
-				        if(args.specs) {
-				        	$('#panCentros').slideUp();
-				            $('#panEspecialidades').slideDown();
-				        }
-				        else if (args.caps) {
-				        	$('#panEspecialidades').slideUp();
-				            $('#panCentros').slideDown();
-				        } else if (args.pats) {
-				            $('#panCentros').slideUp();
-				            $('#panEspecialidades').slideUp();
-				        }
-				        */
-				    }
-				</h:outputScript>
-				<p:messages id="mesgs" globalOnly="true" showDetail="true" closable="true" autoupdate="true" />
+				<p:growl id="mesgs" globalOnly="true" showDetail="true" closable="true" autoupdate="true" />
 				<p:panel id="tipoUsuario" header="Especifique el tipo de usuario que desea registrarse">
 					<div class="ui-g ui-fluid">
 						<div class="ui-g-2 ui-md-2">
 							<p:outputLabel value="Tipo de usuario:" for="selUsertype" />
 						</div>
-						<div class="ui-g-6 ui-md-6">
+						<div class="ui-g-10 ui-md-10">
 							<p:selectOneButton id="selUsertype" value="#{RegisterUser.userType}" required="true" unselectable="false" requiredMessage="Debe especificar un tipo de usuario">
 								<f:selectItems value="#{RegisterUser.availableUserTypes}" var="item" itemLabel="#{item.userTypename}" />
-								<p:ajax listener="#{RegisterUser.onUserTypeChange}" update="panCombos" oncomplete="handleRequest(xhr, status, args)" />
+								<p:ajax listener="#{RegisterUser.onUserTypeChange}" update="panCombos" />
 							</p:selectOneButton>
 						</div>
-						<div class="ui-g-4 ui-md-4" />
 					</div>
 				</p:panel>
 				<br />
@@ -83,9 +65,12 @@
 							<p:outputLabel value="NIF:" for="nif" />
 						</div>
 						<div class="ui-g-4 ui-md-4">
-							<p:inputText id="nif" value="#{RegisterUser.nif}" validator="nifValidator" maxlength="20" required="true" requiredMessage="Por favor, indque su NIF">
-								<p:ajax event="blur" update="nifmsg" listener="#{RegisterUser.hadleNIFValueChange}" />
-							</p:inputText>
+							<div class="ui-inputgroup">
+								<p:inputText id="nif" value="#{RegisterUser.nif}" validator="nifValidator" maxlength="20" required="true" requiredMessage="Por favor, indque su NIF">
+									<p:ajax event="blur" update="nifmsg" listener="#{RegisterUser.hadleNIFValueChange}" oncomplete="handleNIFResponse(xhr, status, args)" />
+								</p:inputText>
+								<p:commandButton widgetVar="nifButton" icon="pi pi-times" styleClass="red-button" />
+							</div>
 						</div>
 						<div class="ui-g-6 ui-md-6">
 							<p:message id="nifmsg" for="nif" />
@@ -151,7 +136,8 @@
 								</div>
 								<div class="ui-g-4 ui-md-4">
 									<p:autoComplete id="selPHC" dropdown="true" required="true" value="#{RegisterUser.primaryHealthCareCenter}" completeMethod="#{RegisterUser.completePrimaryHealCareCenter}"
-										var="phc" itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria">
+										var="phc" itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria"
+										placeholder="Seleccione una CAP o teclee para buscar...">
 										<o:converter converterId="omnifaces.ListConverter" list="#{RegisterUser.phcList}" />
 										<p:column headerText="Nombre">
 											<h:outputText value="#{phc.name}" />
@@ -172,7 +158,8 @@
 								</div>
 								<div class="ui-g-4 ui-md-4">
 									<p:autoComplete id="selMS" dropdown="true" required="true" value="#{RegisterUser.medicalSpecialty}" completeMethod="#{RegisterUser.completeMedicalSpecialty}" var="ms"
-										itemLabel="#{ms.displayName}" itemValue="#{ms}" forceSelection="true" requiredMessage="Por favor, selecciona una especialidad médica">
+										itemLabel="#{ms.displayName}" itemValue="#{ms}" forceSelection="true" requiredMessage="Por favor, selecciona una especialidad médica"
+										placeholder="Seleccione una especialidad médica o teclee para buscar...">
 										<o:converter converterId="omnifaces.ListConverter" list="#{RegisterUser.medicalSpecialtiesList}" />
 										<p:column headerText="Nombre">
 											<h:outputText value="#{ms.name}" />
diff --git a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
index 14eef16..d160518 100644
--- a/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
+++ b/1.sources/MyHealth/docroot/profile/UpdateProfile.xhtml
@@ -7,20 +7,19 @@
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
 		<h:form id="frmUpdateProfile">
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
 
 			<p:panel id="tipoUsuario" header="Tipo de usuario registrado">
 				<div class="ui-g ui-fluid">
 					<div class="ui-g-2 ui-md-2">
 						<p:outputLabel value="Tipo de usuario:" for="selUsertype" />
 					</div>
-					<div class="ui-g-6 ui-md-6">
+					<div class="ui-g-10 ui-md-10">
 						<p:selectOneButton id="selUsertype" value="#{UpdateProfile.userType}" disabled="true" required="true" unselectable="false"
 							requiredMessage="Debe especificar un tipo de usuario">
 							<f:selectItems value="#{UpdateProfile.userTypes}" var="item" itemLabel="#{item.userTypename}" itemValue="#{item.name}" />
 						</p:selectOneButton>
 					</div>
-					<div class="ui-g-4 ui-md-4"></div>
 				</div>
 			</p:panel>
 			<br />
@@ -41,9 +40,12 @@
 						<p:outputLabel value="NIF:" for="nif" />
 					</div>
 					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="nif" value="#{UpdateProfile.nif}" validator="nifValidator" required="true" maxlength="50" requiredMessage="Por favor, indque su NIF">
-							<p:ajax event="blur" update="nifmsg" listener="#{UpdateProfile.hadleNIFValueChange}" />
-						</p:inputText>
+						<div class="ui-inputgroup">
+							<p:inputText id="nif" value="#{UpdateProfile.nif}" validator="nifValidator" maxlength="20" required="true" requiredMessage="Por favor, indque su NIF">
+								<p:ajax event="blur" update="nifmsg" listener="#{UpdateProfile.hadleNIFValueChange}" oncomplete="handleNIFResponse(xhr, status, args)" />
+							</p:inputText>
+							<p:commandButton widgetVar="nifButton" icon="pi pi-check" styleClass="green-button" />
+						</div>
 					</div>
 					<div class="ui-g-6 ui-md-6">
 						<p:message id="nifmsg" for="nif" display="text" />
@@ -117,7 +119,7 @@
 						</div>
 						<div class="ui-g-4 ui-md-4">
 							<p:autoComplete id="selPHC" dropdown="true" value="#{UpdateProfile.primaryHealthCareCenter}" completeMethod="#{UpdateProfile.completePrimaryHealCareCenter}" var="phc"
-								itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria">
+								itemLabel="#{phc.displayName}" itemValue="#{phc}" forceSelection="true" required="true" requiredMessage="Por favor, selecciona un nuevo centro de antención primaria">
 								<o:converter converterId="omnifaces.ListConverter" list="#{UpdateProfile.phcList}" />
 								<p:column headerText="Nombre">
 									<h:outputText value="#{phc.name}" />
@@ -138,7 +140,7 @@
 						</div>
 						<div class="ui-g-4 ui-md-4">
 							<p:autoComplete id="selMS" dropdown="true" value="#{UpdateProfile.medicalSpecialty}" completeMethod="#{UpdateProfile.completeMedicalSpecialty}" var="ms"
-								itemLabel="#{ms.displayName}" itemValue="#{ms}" forceSelection="true" requiredMessage="Por favor, selecciona una especialidad médica">
+								itemLabel="#{ms.displayName}" itemValue="#{ms}" forceSelection="true" required="true" requiredMessage="Por favor, selecciona una especialidad médica">
 								<o:converter converterId="omnifaces.ListConverter" list="#{UpdateProfile.medicalSpecialtiesList}" />
 								<p:column headerText="Nombre">
 									<h:outputText value="#{ms.name}" />
@@ -159,7 +161,8 @@
 						</div>
 						<div class="ui-g-4 ui-md-4">
 							<p:autoComplete id="FamilyDoc" readonly="true" dropdown="true" required="true" value="#{UpdateProfile.familyDoctor}" completeMethod="#{UpdateProfile.completeFamilyDoctor}"
-								var="fd" itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia">
+								var="fd" itemLabel="#{fd.displayName}" itemValue="#{fd}" forceSelection="true" requiredMessage="Por favor, selecciona un médico de familia"
+								placeholder="Seleccione su médico de familia a través de la opción de cambiar médico de familia...">
 								<o:converter converterId="omnifaces.ListConverter" list="#{UpdateProfile.familyDoctorList}" />
 								<p:column headerText="Num. Prof.">
 									<h:outputText value="#{fd.professionalNumber}" />
diff --git a/1.sources/MyHealth/docroot/resources/css/estilos.css b/1.sources/MyHealth/docroot/resources/css/estilos.css
index f88cc78..2c95b88 100644
--- a/1.sources/MyHealth/docroot/resources/css/estilos.css
+++ b/1.sources/MyHealth/docroot/resources/css/estilos.css
@@ -9,4 +9,31 @@ BODY {
 .nopadding {
 	padding: 0 !important;
 	margin: 0 !important;
+}
+
+ul.ui-menu-list {
+	white-space: nowrap;
+	width: auto !important;
+}
+
+.green-button.ui-button.ui-state-default {
+	background-color: #5cb85c;
+	border-color: #5cb85c;
+	color: #fff;
+}
+
+.green-button.ui-button.ui-state-default:enabled:hover, .green-button.ui-button.ui-state-default:focus {
+	background-color: #4cae4c;
+	border-color: #5cb85c;
+}
+
+.red-button.ui-button.ui-state-default {
+	background-color: #d9534f;
+	border-color: #d9534f;
+	color: #fff;
+}
+
+.red-button.ui-button.ui-state-default:enabled:hover, .red-button.ui-button.ui-state-default:focus {
+	background-color: #d43f3a;
+	border-color: #d9534f;
 }
\ No newline at end of file
diff --git a/1.sources/MyHealth/docroot/resources/js/common.js b/1.sources/MyHealth/docroot/resources/js/common.js
new file mode 100644
index 0000000..f78061d
--- /dev/null
+++ b/1.sources/MyHealth/docroot/resources/js/common.js
@@ -0,0 +1,41 @@
+/**
+ * Funciones comunes JavaScript para el proyecto MyHealth
+ * 
+ * 
+ */
+
+// Gestiona la ventana de login
+function handleLoginRequest(xhr, status, args) {
+	if (args.validationFailed || !args.loggedIn) {
+		PF('dlgLogin').jq.effect("shake", {
+			times : 5
+		}, 100);
+		PF('btnLogin').enable();
+	} else {
+		PF('btnLogin').enable();
+		PF('dlgLogin').hide();
+	}
+}
+
+// Tras empezar la petición AJAX de login desabilita el botón para evitar doble login
+function startLogin() {
+	PF('btnLogin').disable();
+}
+
+// Valida si un NIF está duplicado.
+function handleNIFResponse(xhr, status, args) {
+	var nif = PF('nifButton');
+	if (args.NIFisDupe == false) {
+		nif.jq.children(".ui-icon").removeClass("pi pi-times");
+		nif.jq.removeClass('red-button');
+
+		nif.jq.children(".ui-icon").addClass("pi pi-check");
+		nif.jq.addClass('green-button');
+	} else if (nif.jq.hasClass('red-button') == false) {
+		nif.jq.children(".ui-icon").removeClass("pi pi-check");
+		nif.jq.removeClass('green-button');
+
+		nif.jq.children(".ui-icon").addClass("pi pi-times");
+		nif.jq.addClass('red-button');
+	}
+}
\ No newline at end of file
diff --git a/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
index e3891a3..04ba735 100644
--- a/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
+++ b/1.sources/MyHealth/docroot/systemAdmin/ManageSpecialties.xhtml
@@ -2,58 +2,64 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui">
+	xmlns:p="http://primefaces.org/ui" xmlns:o="http://omnifaces.org/ui">
 
 <ui:composition template="../header.xhtml">
 	<ui:define name="content">
-		<h:form id="TestForm">
-			<p:messages id="mesgs" showDetail="true" closable="true" autoupdate="true" />
-			<p:panel id="PanelUnderConstruction" header="Pagina en construcción de Administrador">
+		<h:form id="frmManageSpecialties">
+			<p:growl id="mesgs" showDetail="true" closable="true" autoupdate="true" />
+			<p:panel id="PanelMS" header="Modificación y borrado de especialidades">
 				<div class="ui-g ui-fluid">
+					<div class="ui-g-2 ui-md-2">
+					<p:outputLabel for="ms"/>
+					    <p:selectOneMenu id="ms" value="#{ManageSpecialities.medicalSpecialty}" converter="omnifaces.SelectItemsIndexConverter"
+					    	effect="fold" editable="true" filter="true" filterMatchMode="startsWith"
+					    	placeholder="- Selecciona una especialidad -">
+					        <f:selectItems value="#{ManageSpecialities.medicalSpecialtiesList}" var="ms" itemValue="#{ms}" itemLabel="#{ms.name}" />
+					        <f:ajax render="name description" />
+					    </p:selectOneMenu>
+					</div>
+					<div class="ui-g-1 ui-md-1" >
+						<p:outputLabel value="Nombre: " for="name"/>
+					</div>
+					<div class="ui-g-2 ui-md-2">
+						<p:inputText id="name" value="#{ManageSpecialities.medicalSpecialty.name}" readonly="false" required="true" requiredMessage="Es necesario un nombre" />
+					</div>
+					<div class="ui-g-1 ui-md-1">
+						<p:outputLabel value="Descripción: " for="description" />
+					</div>
+					<div class="ui-g-4 ui-md-4">
+						<p:inputText id="description" value="#{ManageSpecialities.medicalSpecialty.description}" readonly="false" required="true" requiredMessage="Es necesaria una descripción" />
+					</div>
+					<div class="ui-g-1 ui-md-1 ">
+						<p:commandButton validateClient="true" value="Guardar" update="mesgs" action="#{ManageSpecialities.saveData}" icon="pi pi-save" />
+					</div>
+					<div class="ui-g-1 ui-md-1 ">
+						<p:commandButton validateClient="true" value="Borrar" update="mesgs" action="#{ManageSpecialities.deleteData}" icon="fa fa-remove" />
+					</div>
+			    </div>
+    		</p:panel>
 
-					<div class="ui-g-4 ui-md-4">
-						<p:outputLabel for="campo" value="Etiqueta para campo de formulario:" />
+			<p:panel id="PanelNewMS" header="Alta de especialidades">
+				<div class="ui-g ui-fluid">
+					<div class="ui-g-1 ui-md-1" >
+						<p:outputLabel value="Nombre: " for="nameNew"/>
 					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="campo" value="Valor del campo del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					<div class="ui-g-2 ui-md-2">
+						<p:inputText id="nameNew" value="#{ManageSpecialities.name}" readonly="false" required="ManageSpecialities.medicalSpecialty.name eq null" requiredMessage="Es necesario un nombre" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:message for="campo" display="text" />
+					<div class="ui-g-1 ui-md-1">
+						<p:outputLabel value="Descripción: " for="descriptionNew" />
 					</div>
-
-					<div class="ui-g-4 ui-md-4">
-						<p:outputLabel for="campo2" value="Etiqueta para campo 2 de formulario:" />
+					<div class="ui-g-6 ui-md-6">
+						<p:inputText id="descriptionNew" value="#{ManageSpecialities.description}" readonly="false" required="ManageSpecialities.medicalSpecialty.description eq null" requiredMessage="Es necesaria una descripción" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="campo2" value="Valor del campo 2 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
+					<div class="ui-g-2 ui-md-2 ">
+						<p:commandButton validateClient="true" value="Crear" update="mesgs" action="#{ManageSpecialities.insertData}" icon="pi pi-check" />
 					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:message for="campo" display="text" />
-					</div>
-
-					<div class="ui-g-4 ui-md-4">
-						<p:outputLabel for="campo3" value="Etiqueta para campo 3 de formulario:" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:inputText id="campo3" value="Valor del campo 3 del formulario" required="true" requiredMessage="Por favor, especifique un valor" />
-					</div>
-					<div class="ui-g-4 ui-md-4">
-						<p:message for="campo" display="text" />
-					</div>
-
-					<div class="ui-g-12 ui-g-nopad">
-						<div class="ui-g-4 ui-md-4" />
-						<div class="ui-g-2 ui-md-2 ">
-							<p:commandButton validateClient="true" value="Guardar" update="TestForm" action="#{BeanName.actionMethod}" icon="pi pi-check" />
-						</div>
-						<div class="ui-g-2 ui-md-2">
-							<p:button value="Volver" outcome="/home" icon="pi pi-home" />
-						</div>
-						<div class="ui-g-4 ui-md-4" />
-					</div>
-				</div>
-			</p:panel>
+			    </div>
+    		</p:panel>
 		</h:form>
 	</ui:define>
 </ui:composition>
-</html>
+</html>
\ No newline at end of file
diff --git a/1.sources/MyHealth/src/META-INF/application.xml b/1.sources/MyHealth/src/META-INF/application.xml
index 80831e2..9819b60 100644
--- a/1.sources/MyHealth/src/META-INF/application.xml
+++ b/1.sources/MyHealth/src/META-INF/application.xml
@@ -1,13 +1,15 @@
-<application>
-  <display-name>MyHealth</display-name>
-  <module>
-    <web>
-      <web-uri>MyHealth.war</web-uri>
-      <context-root>/MyHealth</context-root>
-    </web>
-  </module>
-  <module>
-    <ejb>MyHealth.jar</ejb>
-  </module>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd" version="6">
+	<application-name>MyHealth</application-name>
+	<display-name>MyHealth</display-name>
+	<module>
+		<web>
+			<web-uri>MyHealth.war</web-uri>
+			<context-root>/MyHealth</context-root>
+		</web>
+	</module>
+	<module>
+		<ejb>MyHealth.jar</ejb>
+	</module>
 </application>
-
diff --git a/1.sources/MyHealth/src/TO/MedicalSpecialtyTO.java b/1.sources/MyHealth/src/TO/MedicalSpecialtyTO.java
index 40d43a4..8b35945 100644
--- a/1.sources/MyHealth/src/TO/MedicalSpecialtyTO.java
+++ b/1.sources/MyHealth/src/TO/MedicalSpecialtyTO.java
@@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  * @author Marcos García Núñez (mgarcianun@uoc.edu)
  *
  */
-@XmlRootElement(name = "medicalspeciality")
+@XmlRootElement(name = "medicalSpecialty")
 public class MedicalSpecialtyTO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
diff --git a/1.sources/MyHealth/src/TO/PatientTO.java b/1.sources/MyHealth/src/TO/PatientTO.java
index 7cd78ca..fb7ae45 100644
--- a/1.sources/MyHealth/src/TO/PatientTO.java
+++ b/1.sources/MyHealth/src/TO/PatientTO.java
@@ -4,8 +4,6 @@ import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import jpa.FamilyDoctorJPA;
-
 /**
  * 
  * @author Marcos García Núñez (mgarcianun@uoc.edu)
diff --git a/1.sources/MyHealth/src/common/Constants.java b/1.sources/MyHealth/src/common/Constants.java
index d56325e..07f3855 100644
--- a/1.sources/MyHealth/src/common/Constants.java
+++ b/1.sources/MyHealth/src/common/Constants.java
@@ -9,4 +9,6 @@ public class Constants {
 	public static final int MAX_ITEMS_AUTOCOMPLETE_SEARCH = 200;
 	public static final String PROFESSIONAL_NUMBER_PREFIX = "PRO#";
 	public static final String PERSONAL_IDENTIFICATION_CODE_PREFIX = "PAT#";
+	
+	public static final int DEFAULT_TABLE_GRID_PAGE_SIZE = 20;
 }
diff --git a/1.sources/MyHealth/src/common/Utils.java b/1.sources/MyHealth/src/common/Utils.java
index 0926f7e..278b248 100644
--- a/1.sources/MyHealth/src/common/Utils.java
+++ b/1.sources/MyHealth/src/common/Utils.java
@@ -1,6 +1,7 @@
 package common;
 
 import java.text.Normalizer;
+import java.util.Objects;
 
 /**
  * 
@@ -11,9 +12,18 @@ public class Utils {
 	public static String stripAccents(String input) {
 		return input == null ? null : Normalizer.normalize(input, Normalizer.Form.NFD).replaceAll("\\p{InCombiningDiacriticalMarks}+", "");
 	}
-	
+
 	public static String normalizeTerm(String input) {
-		//return stripAccents(input).toLowerCase();
+		// return stripAccents(input).toLowerCase();
 		return input.toLowerCase();
 	}
+
+	public static Throwable getExceptionRootCause(Throwable throwable) {
+		Objects.requireNonNull(throwable);
+		Throwable rootCause = throwable;
+		while (rootCause.getCause() != null && rootCause.getCause() != rootCause) {
+			rootCause = rootCause.getCause();
+		}
+		return rootCause;
+	}
 }
diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
index 47b55db..1ca340f 100644
--- a/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java
@@ -6,23 +6,27 @@ import java.util.List;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
-import org.jboss.security.auth.spi.Users.User;
-
 import TO.FamilyDoctorTO;
 import TO.MedicalSpecialtyTO;
 import TO.PatientTO;
 import TO.PrimaryHealthCareCenterTO;
+import TO.QuestionTO;
 import TO.SpecialistDoctorTO;
 import common.Utils;
 import jpa.FamilyDoctorJPA;
 import jpa.MedicalSpecialtyJPA;
 import jpa.PatientJPA;
 import jpa.PrimaryHealthCareCenterJPA;
+import jpa.QuestionJPA;
 import jpa.SpecialistDoctorJPA;
 
+/***
+ * 
+ * @author Marcos García Núñez (mgarcianun@uoc.edu)
+ *
+ */
 @Stateless
 public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 	// Persistence Unit Context
@@ -30,7 +34,9 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 	private EntityManager entman;
 
 	/**
-	 * Metodo que devuelve todas las especialidades medicas
+	 * Metodo que devuelve todas las especialidades medicas registradas en el sistema
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
 	 */
 	public List<MedicalSpecialtyTO> listAllMedicalSpecialities() {
 		return this.listMedicalSpecialitiesPaged(0, 0);
@@ -39,14 +45,26 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 	/**
 	 * Metodo que devuelve las especialidades médicas de forma paginada
 	 * 
-	 * Acepta como parametro la página (comenzando en 0) y el número de elementos de
-	 * cada página
+	 * Acepta como parametro la página (comenzando en 0) y el número de elementos de cada página.
 	 * 
+	 * si pageSize == 0, entonces se devuelven todas las especialidades registradas (Se ignora el parámetro).
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
 	 */
 	public List<MedicalSpecialtyTO> listMedicalSpecialitiesPaged(int pageNumber, int pageSize) {
 		return listMedicalSpecialitiesFiltered(null, pageNumber, pageSize);
 	}
 
+	/**
+	 * Método que devuelve una lista de espcialidades médicas que tienen una coincidencia parcial en el nombre o en la descripción con el termino de búsqueda (searchTerm)
+	 * especificado.
+	 * 
+	 * Además permite la paginacción de datos. Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * Si serachTerm es nulo o cadena vacía entonces no se tiene en cuenta el parámetro y devuelven todas las especialidades existentes.
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
+	 */
 	public List<MedicalSpecialtyTO> listMedicalSpecialitiesFiltered(String searchTerm, int pageNumber, int pageSize) {
 		String strQuery = "SELECT ms from MedicalSpecialtyJPA ms %s order by ms.name, ms.description";
 		String strFilter = "";
@@ -79,14 +97,36 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return allSpecialities;
 	}
 
+	/**
+	 * Método que devuelve todos los CAPs registrados en el sistema
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
+	 */
 	public List<PrimaryHealthCareCenterTO> listAllCAPs() {
 		return this.listCAPsPaged(0, 0);
 	}
 
+	/**
+	 * Método que devuelve una lista de CAPs (Centros de Atención Primarios) de forma paginada
+	 * 
+	 * Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * @return Devuelve una Lista de MedicalSpecialtyTO (Transfer Objects).
+	 */
 	public List<PrimaryHealthCareCenterTO> listCAPsPaged(int pageNumber, int pageSize) {
 		return this.listCAPsFiltered(null, pageNumber, pageSize);
 	}
 
+	/**
+	 * Método que devuelve una lista de CAPs (Centros de Atención Primarios) que tienen una coincidencia parcial en el nombre o en la localización con el termino de búsqueda
+	 * (searchTerm) especificado.
+	 * 
+	 * Además permite la paginacción de datos. Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * Si serachTerm es nulo o cadena vacía entonces no se tiene en cuenta el parámetro y devuelven todos los CAPs existentes.
+	 * 
+	 * @return Devuelve una Lista de PrimaryHealthCareCenterTO (Transfer Objects).
+	 */
 	public List<PrimaryHealthCareCenterTO> listCAPsFiltered(String searchTerm, int pageNumber, int pageSize) {
 		String strQuery = "SELECT phc from PrimaryHealthCareCenterJPA phc %s order by phc.name, phc.location";
 		String strFilter = "";
@@ -119,14 +159,35 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return allCAPs;
 	}
 
+	/**
+	 * Método que devuelve una lista con todos los médicos de familia registrados en el sistema.
+	 * 
+	 * @return Devuelve una Lista de FamilyDoctorTO (Transfer Objects).
+	 */
 	public List<FamilyDoctorTO> listAllFamilyDoctors() {
 		return this.listFamilyDoctorsPaged(0, 0);
 	}
 
+	/**
+	 * Método que devuelve una lista con todos los médicos de familia registrados en el sistema de forma paginada.
+	 * 
+	 * Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * @return Devuelve una Lista de FamilyDoctorTO (Transfer Objects).
+	 */
 	public List<FamilyDoctorTO> listFamilyDoctorsPaged(int pageNumber, int pageSize) {
 		return this.listFamilyDoctorsFiltered(null, pageNumber, pageSize);
 	}
 
+	/**
+	 * Método que devuelve una lista de médicos de familia que tienen una coincidencia parcial en el nombre o en los apellidos con el termino de búsqueda (searchTerm) especificado.
+	 * 
+	 * Además permite la paginacción de datos. Si pageSize == 0 no se realiza paginación y se devuelven todos los resultados.
+	 * 
+	 * Si serachTerm es nulo o cadena vacía entonces no se tiene en cuenta el parámetro y devuelven todos los registros existentes.
+	 * 
+	 * @return Devuelve una Lista de FamilyDoctorTO (Transfer Objects).
+	 */
 	public List<FamilyDoctorTO> listFamilyDoctorsFiltered(String searchTerm, int pageNumber, int pageSize) {
 		String strQuery = "SELECT fd FROM FamilyDoctorJPA fd %s order by fd.name, fd.surname";
 		String strFilter = "";
@@ -159,6 +220,11 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return allFDTOs;
 	}
 
+	/**
+	 * Método que convierte un objecto de tipo MedicalSpecialtyJPA (JPA) a su equivalente MedicalSpecialtyTO (Tranfer Object)
+	 * 
+	 * @return MedicalSpecialtyTO (Transfer Object de una especialidad médica)
+	 */
 	public MedicalSpecialtyTO getPOJOforMedicalSpecialtyJPA(MedicalSpecialtyJPA ms) {
 		MedicalSpecialtyTO msTO = null;
 
@@ -169,6 +235,11 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return msTO;
 	}
 
+	/**
+	 * Método que convierte un objecto de tipo PrimaryHealthCareCenterJPA (JPA) a su equivalente PrimaryHealthCareCenterTO (Tranfer Object)
+	 * 
+	 * @return PrimaryHealthCareCenterTO (Transfer Object de un CAP)
+	 */
 	public PrimaryHealthCareCenterTO getPOJOforPrimaryHealthCareCenterJPA(PrimaryHealthCareCenterJPA phc) {
 		PrimaryHealthCareCenterTO phcTO = null;
 
@@ -179,6 +250,14 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return phcTO;
 	}
 
+	/**
+	 * Método que convierte un objecto de tipo SpecialistDoctorJPA (JPA) a su equivalente SpecialistDoctorTO (Tranfer Object)
+	 * 
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object de un médico especialista)
+	 */
 	public SpecialistDoctorTO getPOJOforSpecialistDoctorJPA(SpecialistDoctorJPA sd, int nestedProps) {
 		SpecialistDoctorTO sdTO = null;
 
@@ -195,6 +274,14 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return sdTO;
 	}
 
+	/**
+	 * Método que convierte un objecto de tipo FamilyDoctorJPA (JPA) a su equivalente FamilyDoctorTO (Tranfer Object)
+	 *
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object de un médico especialista)
+	 */
 	public FamilyDoctorTO getPOJOforFamilyDoctorJPA(FamilyDoctorJPA fd, int nestedProps) {
 		FamilyDoctorTO fdTO = null;
 
@@ -211,6 +298,14 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return fdTO;
 	}
 
+	/**
+	 * Método que convierte un objecto de tipo PatientJPA (JPA) a su equivalente PatientTO (Tranfer Object)
+	 * 
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return PatientTO (Transfer Object de un médico especialista)
+	 */
 	public PatientTO getPOJOforPatientJPA(PatientJPA pat, int nestedProps) {
 		PatientTO paTO = null;
 
@@ -227,11 +322,21 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		return paTO;
 	}
 
+	/**
+	 * Método que recupera un paciente a partir de su Identificador (Id) de base de datos.
+	 * 
+	 * @return PatientTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public PatientTO findPatientById(int patientId) {
 		// Recuperamos propiedades anidadas 1 nivel!
 		return this.getPOJOforPatientJPA(entman.find(PatientJPA.class, patientId), 1);
 	}
 
+	/**
+	 * Método que recupera un paciente a partir de su CIP (Código de Identificación de Paciente)
+	 * 
+	 * @return PatientTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public PatientTO findPatientByCode(String code) {
 		TypedQuery<PatientJPA> query = entman.createQuery("from PatientJPA pat where pat.personalIdentificationCode=:code", PatientJPA.class);
 		query.setMaxResults(1);
@@ -244,10 +349,15 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 			return null;
 	}
 
-	public PatientTO findPatientByNif(String searchValue) {
+	/**
+	 * Método que recupera un paciente a partir de su NIF
+	 * 
+	 * @return PatientTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public PatientTO findPatientByNif(String searchedNIF) {
 		TypedQuery<PatientJPA> query = entman.createQuery("from PatientJPA pat where pat.nif=:nif", PatientJPA.class);
 		query.setMaxResults(1);
-		query.setParameter("nif", searchValue);
+		query.setParameter("nif", searchedNIF);
 
 		List<PatientJPA> results = query.getResultList();
 		if (results.size() > 0)
@@ -256,10 +366,20 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 			return null;
 	}
 
+	/**
+	 * Método que recupera un médico de familia a partir de su Identificador (Id) de base de datos.
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public FamilyDoctorTO findFamilyDoctorById(int ProfessionalNumberId) {
 		return this.getPOJOforFamilyDoctorJPA(entman.find(FamilyDoctorJPA.class, ProfessionalNumberId), 1);
 	}
 
+	/**
+	 * Método que recupera un médico de familia a partir de su NP (Número de profesional)
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public FamilyDoctorTO findFamilyDoctorByCode(String code) {
 		TypedQuery<FamilyDoctorJPA> query = entman.createQuery("from FamilyDoctorJPA d where d.professionalNumber=:code", FamilyDoctorJPA.class);
 
@@ -272,10 +392,15 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 			return null;
 	}
 
-	public FamilyDoctorTO findFamilyDoctorByNif(String searchValue) {
+	/**
+	 * Método que recupera un médico de familia a partir de su NIF
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public FamilyDoctorTO findFamilyDoctorByNif(String searchedNIF) {
 		TypedQuery<FamilyDoctorJPA> query = entman.createQuery("from FamilyDoctorJPA d where d.nif=:nif", FamilyDoctorJPA.class);
 		query.setMaxResults(1);
-		query.setParameter("nif", searchValue);
+		query.setParameter("nif", searchedNIF);
 
 		List<FamilyDoctorJPA> results = query.getResultList();
 		if (results.size() > 0)
@@ -284,10 +409,20 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 			return null;
 	}
 
+	/**
+	 * Método que recupera un médico especialista a partir de su Identificador (Id) de base de datos.
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public SpecialistDoctorTO findSpecialistDoctorById(int ProfessionalNumberId) {
 		return this.getPOJOforSpecialistDoctorJPA(entman.find(SpecialistDoctorJPA.class, ProfessionalNumberId), 1);
 	}
 
+	/**
+	 * Método que recupera un médico especialista a partir de su NP (Número de profesional)
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
 	public SpecialistDoctorTO findSpecialistDoctorByCode(String code) {
 		TypedQuery<SpecialistDoctorJPA> query = entman.createQuery("from SpecialistDoctorJPA d where d.professionalNumber=:code", SpecialistDoctorJPA.class);
 
@@ -300,10 +435,15 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 			return null;
 	}
 
-	public SpecialistDoctorTO findSpecialistDoctorByNif(String searchValue) {
+	/**
+	 * Método que recupera un médico especialista a partir de su NIF
+	 * 
+	 * @return SpecialistDoctorTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public SpecialistDoctorTO findSpecialistDoctorByNif(String searchedNIF) {
 		TypedQuery<SpecialistDoctorJPA> query = entman.createQuery("from SpecialistDoctorJPA d where d.nif=:nif", SpecialistDoctorJPA.class);
 		query.setMaxResults(1);
-		query.setParameter("nif", searchValue);
+		query.setParameter("nif", searchedNIF);
 
 		List<SpecialistDoctorJPA> results = query.getResultList();
 		if (results.size() > 0)
@@ -311,4 +451,32 @@ public class CommonFacadeBean implements CommonFacadeRemote, CommonFacadeLocal {
 		else
 			return null;
 	}
+
+	/**
+	 * Método que convierte un objecto de tipo QuestionJPA (JPA) a su equivalente QuestionTO (Tranfer Object)
+	 *
+	 * El parámetro nestedProps es un valor entero que indica a que nivel de profundidad se debe navegar a través de las propiedades relacionadas para convertirlas de JPA a TO. Un
+	 * valor 0 indica que no se convertirá ninguna propiedad que tenga un entidad JPA relacionada (tendrá valor null en el objeto TO).
+	 * 
+	 * @return QuestionTO (Transfer Object del objeto recuperado) o null si no se encuentra el objeto buscado
+	 */
+	public QuestionTO getPOJOforQuestionJPA(QuestionJPA qs, int nestedProps) {
+		QuestionTO qsTO = null;
+
+		if (qs != null) {
+			FamilyDoctorJPA fd = null;
+			PatientJPA pat = null;
+			if (nestedProps > 0) {
+				fd = qs.getFamilyDoctor();
+				pat = qs.getPatient();
+			}
+
+			nestedProps--;
+			qsTO = new QuestionTO(qs.getId(), qs.getTitle(), qs.getMessage(), qs.getStatus(), this.getPOJOforPatientJPA(pat, nestedProps),
+					this.getPOJOforFamilyDoctorJPA(fd, nestedProps), qs.getResponse());
+		}
+
+		return qsTO;
+	}
+
 }
diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java
index 72772f2..1dd6766 100644
--- a/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java
+++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeLocal.java
@@ -1,6 +1,5 @@
 package ejb.common;
 
-import java.util.Collection;
 import java.util.List;
 
 import javax.ejb.Local;
@@ -9,11 +8,13 @@ import TO.FamilyDoctorTO;
 import TO.MedicalSpecialtyTO;
 import TO.PatientTO;
 import TO.PrimaryHealthCareCenterTO;
+import TO.QuestionTO;
 import TO.SpecialistDoctorTO;
 import jpa.FamilyDoctorJPA;
 import jpa.MedicalSpecialtyJPA;
 import jpa.PatientJPA;
 import jpa.PrimaryHealthCareCenterJPA;
+import jpa.QuestionJPA;
 import jpa.SpecialistDoctorJPA;
 
 /**
@@ -70,4 +71,5 @@ public interface CommonFacadeLocal {
 
 	public PatientTO getPOJOforPatientJPA(PatientJPA pat, int nestedProps);
 
+	public QuestionTO getPOJOforQuestionJPA(QuestionJPA qs, int nestedProps);
 }
diff --git a/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java b/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java
index e386ac8..533669e 100644
--- a/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java
+++ b/1.sources/MyHealth/src/ejb/common/CommonFacadeRemote.java
@@ -1,6 +1,5 @@
 package ejb.common;
 
-import java.util.Collection;
 import java.util.List;
 
 import javax.ejb.Remote;
@@ -10,9 +9,6 @@ import TO.MedicalSpecialtyTO;
 import TO.PatientTO;
 import TO.PrimaryHealthCareCenterTO;
 import TO.SpecialistDoctorTO;
-import jpa.FamilyDoctorJPA;
-import jpa.PatientJPA;
-import jpa.SpecialistDoctorJPA;
 
 /**
  * 
diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
index 5cfe363..8dd4956 100644
--- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeBean.java
@@ -1,20 +1,21 @@
 package ejb.medicalTest;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
 
-import TO.FamilyDoctorTO;
 import TO.LoggedUserTO;
 import TO.MedicalSpecialtyTO;
 import TO.MedicalTestTO.MedicalTestType;
-import TO.PatientTO;
+import TO.QuestionTO;
 import common.QuestionStatus;
 import common.UserType;
-import TO.QuestionTO;
 import ejb.common.CommonFacadeLocal;
 import jpa.FamilyDoctorJPA;
 import jpa.PatientJPA;
@@ -34,10 +35,9 @@ import managedbean.common.SessionUtils;
  */
 @Stateless
 public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
-
 	// Persistence Unit Context
 	@PersistenceContext(unitName = "MyHealth")
-	private EntityManager entman;
+	EntityManager entman;
 
 	@EJB
 	CommonFacadeLocal commonServices;
@@ -77,13 +77,36 @@ public class MedicalTestFacadeBean implements MedicalTestFacadeRemote {
 	public void answerQuestion(String question, String response) {
 	}
 
-	/**
-	 * Recuperar las preguntas sin respuesta para un médico
-	 * 
-	 * @param professionalNumber
-	 */
-	@Override
-	public void listAllPendingQuestions(int professionalNumber) {
+	public List<QuestionTO> listAllPendingQuestions(int familyDoctorId) {
+		return null;
+	}
+
+	public Long getPendingQuestionsCount(int familyDoctorId) {
+		TypedQuery<Long> query = entman.createQuery("SELECT count(1) from QuestionJPA q where q.status=:status and q.familyDoctor.id=:docId", Long.class);
+		query.setParameter("status", QuestionStatus.PENDING);
+		query.setParameter("docId", familyDoctorId);
+
+		return query.getSingleResult();
+	}
+	
+	public List<QuestionTO> listPendingQuestionsPaged(int familyDoctorId, int pageNumber, int pageSize) {
+		TypedQuery<QuestionJPA> query = entman.createQuery("SELECT q from QuestionJPA q where q.status=:status and q.familyDoctor.id=:docId order by q.title", QuestionJPA.class);
+		query.setParameter("status", QuestionStatus.PENDING);
+		query.setParameter("docId", familyDoctorId);
+
+		if (pageSize > 0) {
+			query.setFirstResult(pageNumber * pageSize);
+			query.setMaxResults(pageSize);
+		}
+
+		List<QuestionJPA> allJPA = query.getResultList();
+		List<QuestionTO> pendingQuestions = new ArrayList<QuestionTO>();
+
+		for (QuestionJPA item : allJPA) {
+			pendingQuestions.add(commonServices.getPOJOforQuestionJPA(item, 1));
+		}
+
+		return pendingQuestions;
 	}
 
 	/**
diff --git a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
index e6828d5..73fcc00 100644
--- a/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
+++ b/1.sources/MyHealth/src/ejb/medicalTest/MedicalTestFacadeRemote.java
@@ -1,11 +1,13 @@
 package ejb.medicalTest;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.ejb.Remote;
 
 import TO.MedicalSpecialtyTO;
 import TO.MedicalTestTO.MedicalTestType;
+import TO.QuestionTO;
 
 /**
  * Interfaz remota del EJB Definimos los métodos que estarán disponibles para
@@ -42,10 +44,14 @@ public interface MedicalTestFacadeRemote {
 	 * 
 	 * De utilidad para paciente y médico de familia. No para médico especialista.
 	 * 
-	 * @param professionalNumber
+	 * @param familydoctorid
 	 */
-	public void listAllPendingQuestions(int professionalNumber);
+	public List<QuestionTO> listAllPendingQuestions(int familyDoctorId);
 
+	public Long getPendingQuestionsCount(int familyDoctorId);
+	
+	public List<QuestionTO> listPendingQuestionsPaged(int familyDoctorId, int pageNumber, int pageSize);
+	
 	/**
 	 * Recuperar una pregunta por su String
 	 * 
diff --git a/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java b/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
index 3b59839..91ba814 100644
--- a/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/profile/ProfileFacadeBean.java
@@ -32,19 +32,42 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 	@PersistenceContext(unitName = "MyHealth")
 	private EntityManager entman;
 
+	//Propiedad que permite el acceso local a los métodos del EJB de servicios comunes (para recuperar entidades, etc).
 	@EJB
 	CommonFacadeLocal commonServices;
 
+	/**
+	 * Método que genera un nuevo número de profesional, basando en la secuencia de base de datos. Los números de profesional son únicos y comunes para médicos de familia y médicos
+	 * especialistas.
+	 * 
+	 * Si un número de profesional no se utiliza no se vuelve a reutilizar, por lo que pueden existir huecos en la númeración.
+	 * 
+	 * @return String con el número número de profesional generado.
+	 */
 	private String getNextProfessionalNumber() {
 		Query q = entman.createNativeQuery("select nextval('myhealth.profesionalnumber')");
 		return Constants.PROFESSIONAL_NUMBER_PREFIX.concat(String.valueOf(q.getSingleResult()));
 	}
 
+	/**
+	 * Método que genera un nuevo Código de Identificación de Paciente (CIP) basado en una secuencia de base de datos. Los códigos CIP son únicos, y si un CIP no se utiliza tras
+	 * haber sido generado, no se vuelve a reutilizar.
+	 * 
+	 * @return String con el CIP gnerado
+	 */
 	private String getNextPersonalIdentificationCode() {
 		Query q = entman.createNativeQuery("select nextval('myhealth.codigoidentificacionpaciente')");
 		return Constants.PERSONAL_IDENTIFICATION_CODE_PREFIX.concat(String.valueOf(q.getSingleResult()));
 	}
 
+	/**
+	 * Cambia el médico de familia asignado a un paciente. Recibe como parametros el identificador del paciente y el identificador del nuevo médico de familia
+	 * 
+	 * Si el identificador de paciente no corresponde a ningún paciente registrado se lanza una excepción. Si el identificador del médico de familia no corresponde a ningún médico
+	 * de familia se lanza una excepción.
+	 * 
+	 * @return PatientTO (Transfer Object del paciente al que se la ha cambiado el médico de familia).
+	 */
 	public PatientTO changeFamilyDoctor(int patientId, int newDoctor) throws Exception {
 		PatientJPA pat = entman.find(PatientJPA.class, patientId);
 		if (pat == null) {
@@ -63,15 +86,37 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforPatientJPA(pat, 1);
 	}
 
+	/**
+	 * Registra un nuevo paciente en el sistema Recibe como parametros el nif del paciente, el nombre, los apellidos, la contraseña y la dirección de correo electronico.
+	 * 
+	 * El método genera un nuevo CIP (código de identificación de paciente) y lo asigna al nuevo paciente. El médico se familia queda está establecido a null, y deberá ser
+	 * seleccionado por el paciente una vez registrado en el sistema.
+	 * 
+	 * La contraseña recibida se encrypta con el algoritmo MD5.
+	 * 
+	 * @return PatientTO Transfer Object correspondiente al paciente registrado.
+	 */
 	public PatientTO registerPatient(int id, String nif, String name, String surname, String password, String email) {
-		PatientTO paTO = null;
-
 		PatientJPA pat = new PatientJPA(this.getNextPersonalIdentificationCode(), nif, name, surname, HashUtils.hashMD5(password), email, null);
 		entman.persist(pat);
 
 		return this.commonServices.getPOJOforPatientJPA(pat, 1);
 	}
 
+	/**
+	 * Registra un nuevo médico especialista en el sistema.
+	 * 
+	 * Recibe como parametros el nif, el nombre, los apellidos, la contraseña, la dirección de correo electronico y la especialidad.
+	 * 
+	 * El método genera un nuevo NIP (Número de Identificación de Profesional) y lo asigna al nuevo médico.
+	 * 
+	 * La contraseña recibida se encrypta con el algoritmo MD5.
+	 * 
+	 * El médoto comprueba que la especialidad médica recibida exista en el sistema en el momento de asignarla al nuevo médico, si la especialidad especificada no se encuentra se
+	 * lanza una excepción.
+	 * 
+	 * @return SpecialistDoctorTO Transfer Object correspondiente al médico especialista registrado.
+	 */
 	public SpecialistDoctorTO registerSpecialistDoctor(int id, String nif, String name, String surname, String password, String email, MedicalSpecialtyTO specialty)
 			throws Exception {
 		MedicalSpecialtyJPA ms = entman.find(MedicalSpecialtyJPA.class, specialty.getId());
@@ -85,9 +130,20 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforSpecialistDoctorJPA(sd, 1);
 	}
 
+	/**
+	 * Registra un nuevo médico de familia en el sistema.
+	 * 
+	 * Recibe como parametros el nif, el nombre, los apellidos, la contraseña, la dirección de correo electronico y el CAP (Centro Médico de Primaria).
+	 * 
+	 * El método genera un nuevo NIP (Número de Identificación de Profesional) y lo asigna al nuevo médico.
+	 * 
+	 * La contraseña recibida se encrypta con el algoritmo MD5.
+	 * 
+	 * El médoto comprueba que el CAP recibido exista en el sistema en el momento de asignarlo al nuevo médico, si el CAP no se encuentra se lanza una excepción.
+	 * 
+	 * @return FamilyDoctorTO Transfer Object correspondiente al médico de familia registrado.
+	 */
 	public FamilyDoctorTO registerFamilyDoctor(int id, String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterTO cap) throws Exception {
-		FamilyDoctorTO fdTO = null;
-
 		PrimaryHealthCareCenterJPA phcC = entman.find(PrimaryHealthCareCenterJPA.class, cap.getId());
 		if (phcC == null) {
 			throw new Exception("No se encuentra el centro de atención primaria con identificador: " + cap.getName());
@@ -99,6 +155,18 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return commonServices.getPOJOforFamilyDoctorJPA(fd, 1);
 	}
 
+	/**
+	 * Actualiza los datos personales de un paciente
+	 * 
+	 * Recibe como parametros el id del paciente a actualizar, el nif, el nombre, los apellidos, *la contraseña, la dirección de correo electronico (El medico de familia asignado
+	 * no se modifica).
+	 * 
+	 * El id de paciente recibido se busca en el sistema para realizar la actualización de datos, sino se encuentra se lanza una excepción.
+	 * 
+	 * La contraseña recibida solo se actualiza si se recibe el parámetro (no es nulo ni cadena vacía). La contraseña recibida se encrypta con el algoritmo MD5
+	 * 
+	 * @return PatientTO Transfer Object correspondiente al paciente actualizado..
+	 */
 	public PatientTO updatePatientData(int id, String nif, String name, String surname, String password, String email) throws Exception {
 		PatientJPA pat = entman.find(PatientJPA.class, id);
 
@@ -119,6 +187,20 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforPatientJPA(pat, 1);
 	}
 
+	/**
+	 * Actualiza los datos personales de un médico especialista
+	 * 
+	 * Recibe como parametros el id del médico a actualizar, nif, el nombre, los apellidos, *la contraseña, la dirección de correo electronico y la especialidad médcia que se debe
+	 * asignar.
+	 * 
+	 * El id del médico recibido se busca en el sistema para realizar la actualización de datos, sino se encuentra se lanza una excepción.
+	 * 
+	 * La contraseña recibida solo se actualiza si se recibe el parámetro (no es nulo ni cadena vacía). La contraseña recibida se encrypta con el algoritmo MD5
+	 * 
+	 * El método comprueba que la especialidad recibida existe en el sistema, en caso contrario lanza una excepción.
+	 * 
+	 * @return SpecialistDoctorTO Transfer Object correspondiente al médico especialista que se ha actualizado.
+	 */
 	public SpecialistDoctorTO updateSpecialistDoctorData(int id, String nif, String name, String surname, String password, String email, MedicalSpecialtyTO specialty)
 			throws Exception {
 		SpecialistDoctorJPA sd = entman.find(SpecialistDoctorJPA.class, id);
@@ -145,6 +227,20 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforSpecialistDoctorJPA(sd, 1);
 	}
 
+	/**
+	 * Actualiza los datos personales de un médico de familia
+	 * 
+	 * Recibe como parametros el id del médico a actualizar, nif, el nombre, los apellidos, *la contraseña, la dirección de correo electronico, y el CAP al cual está asignado el
+	 * médico de familia.
+	 * 
+	 * El id del médico recibido se busca en el sistema para realizar la actualización de datos, sino se encuentra se lanza una excepción.
+	 * 
+	 * La contraseña recibida solo se actualiza si se recibe el parámetro (no es nulo ni cadena vacía). La contraseña recibida se encrypta con el algoritmo MD5
+	 * 
+	 * El método comprueba que el CAP recibida existe en el sistema, en caso contrario lanza una excepción.
+	 * 
+	 * @return FamilyDoctorTO Transfer Object correspondiente al médico de familia que se ha actualizado.
+	 */
 	public FamilyDoctorTO updateFamilyDoctorData(int id, String nif, String name, String surname, String password, String email, PrimaryHealthCareCenterTO phcTO) throws Exception {
 		FamilyDoctorJPA fd = entman.find(FamilyDoctorJPA.class, id);
 		if (fd == null) {
@@ -170,9 +266,18 @@ public class ProfileFacadeBean implements ProfileFacadeRemote {
 		return this.commonServices.getPOJOforFamilyDoctorJPA(fd, 1);
 	}
 
+	/***
+	 * Cambia el CAP (Centro de Atención Primaria) asignado a un médico de familia.
+	 * 
+	 * Recibe como parametros el identificador del médico y el identificador del nuevo CAP a asginar.
+	 * 
+	 * Si el identificador del médico no corresponde a ningún médico de familia registrado se lanza una excepción.
+	 * 
+	 * Si el identificador del CAP no corresponde a ningún CAP registrado en el sistema se lanza una excpeción.
+	 * 
+	 * @return FamilyDoctorTO (Transfer Object del médico de familia al que se la ha cambiado el CAP).
+	 */
 	public FamilyDoctorTO changePrimaryHealthCareCenter(int professionalId, PrimaryHealthCareCenterTO newCenter) throws Exception {
-		FamilyDoctorTO fdTO = null;
-
 		FamilyDoctorJPA fd = entman.find(FamilyDoctorJPA.class, professionalId);
 		if (fd == null) {
 			throw new Exception("No se encuentra en la base de datos ningún médico de familia con id: " + String.valueOf(professionalId));
diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java
index 37785f3..787169a 100644
--- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java
+++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeBean.java
@@ -7,6 +7,7 @@ import javax.persistence.PersistenceContext;
 
 import TO.FamilyDoctorTO;
 import TO.LoggedUserTO;
+import TO.MedicalSpecialtyTO;
 import TO.PatientTO;
 import TO.SpecialistDoctorTO;
 import common.Constants;
@@ -14,6 +15,7 @@ import common.HashUtils;
 import common.UserType;
 import ejb.common.CommonFacadeLocal;
 import jpa.AdministratorJPA;
+import jpa.MedicalSpecialtyJPA;
 
 /**
  * 
@@ -107,4 +109,40 @@ public class SystemAdminFacadeBean implements SystemAdminFacadeRemote {
 
 		return usr;
 	}
+
+	@Override
+	public MedicalSpecialtyTO updateSpecialtyData(int id, String name, String description) throws Exception {
+		MedicalSpecialtyJPA ms = entman.find(MedicalSpecialtyJPA.class, id);
+
+		if (ms == null) {
+			throw new Exception("No se pueden actualizar los datos de la especialidad porque no se encuentra en la base de datos ningún registro con id: " + String.valueOf(id));
+		}
+
+		ms.setName(name);
+		ms.setDescription(description);
+
+		entman.persist(ms);
+
+		return this.commonServices.getPOJOforMedicalSpecialtyJPA(ms);
+	}
+	
+	@Override
+	public void deleteSpecialtyData(int id, String name, String description) throws Exception {
+		MedicalSpecialtyJPA ms = entman.find(MedicalSpecialtyJPA.class, id);
+
+		if (ms == null) {
+			throw new Exception("No se puede borrar la especialidad porque no se encuentra en la base de datos ningún registro con id: " + String.valueOf(id));
+		}
+
+		entman.remove(ms);
+	}
+
+	@Override
+	public MedicalSpecialtyTO insertSpecialtyData(String name, String description) throws Exception {
+
+		MedicalSpecialtyJPA ms = new MedicalSpecialtyJPA(name, description);
+		entman.persist(ms);
+
+		return this.commonServices.getPOJOforMedicalSpecialtyJPA(ms);
+	}
 }
diff --git a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java
index 7c275b5..f4ab02d 100644
--- a/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java
+++ b/1.sources/MyHealth/src/ejb/systemAdmin/SystemAdminFacadeRemote.java
@@ -1,12 +1,9 @@
 package ejb.systemAdmin;
 
-import java.util.Collection;
-
 import javax.ejb.Remote;
 
 import TO.LoggedUserTO;
 import TO.MedicalSpecialtyTO;
-import TO.PrimaryHealthCareCenterTO;
 
 /**
  * 
@@ -19,6 +16,11 @@ public interface SystemAdminFacadeRemote {
 	 * Definimos la interfaz remota
 	 */
 
-
 	public LoggedUserTO login(String id, String pwd);
+	
+	public MedicalSpecialtyTO updateSpecialtyData(int id, String name, String description) throws Exception;
+	
+	public void deleteSpecialtyData(int id, String name, String description) throws Exception;
+	
+	public MedicalSpecialtyTO insertSpecialtyData(String name, String description) throws Exception;
 }
\ No newline at end of file
diff --git a/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java b/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
index 0c77993..4ef186d 100644
--- a/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
+++ b/1.sources/MyHealth/src/jpa/FamilyDoctorJPA.java
@@ -1,7 +1,7 @@
 package jpa;
 
 import java.io.Serializable;
-import java.util.Collection;
+import java.util.List;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -28,7 +28,7 @@ public class FamilyDoctorJPA implements Serializable {
 
 	@Id
 	@Column(updatable = false)
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
 	@Column(nullable = false, unique = true)
 	private String professionalNumber;
@@ -39,9 +39,9 @@ public class FamilyDoctorJPA implements Serializable {
 	private String email;
 	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@JoinColumn(name = "FamilyDoctorId")
-	private Collection<PatientJPA> patients;
+	private List<PatientJPA> patients;
 	@ManyToOne
-	@JoinColumn (name="PrimaryHealthCareCenterId")
+	@JoinColumn(name = "PrimaryHealthCareCenterId")
 	private PrimaryHealthCareCenterJPA primaryHealthCareCenter;
 
 	/**
@@ -111,20 +111,22 @@ public class FamilyDoctorJPA implements Serializable {
 
 	/**
 	 * Metodos para get/set de relaciones (pacientes)
+	 * 
 	 * @return
 	 */
-	public Collection<PatientJPA> getPatients() {
+	public List<PatientJPA> getPatients() {
 		return patients;
 	}
 
-	public void setPatients(Collection<PatientJPA> patients) {
+	public void setPatients(List<PatientJPA> patients) {
 		this.patients = patients;
 	}
-	
+
 	public PrimaryHealthCareCenterJPA getPrimaryHealthCareCenter() {
 		return primaryHealthCareCenter;
 	}
-	public  void setPrimaryHealthCareCenter(PrimaryHealthCareCenterJPA center) {
+
+	public void setPrimaryHealthCareCenter(PrimaryHealthCareCenterJPA center) {
 		this.primaryHealthCareCenter = center;
 	}
 
diff --git a/1.sources/MyHealth/src/jpa/MedicalTestJPA.java b/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
index 87e14b3..9dc8d3a 100644
--- a/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
+++ b/1.sources/MyHealth/src/jpa/MedicalTestJPA.java
@@ -5,6 +5,8 @@ import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -12,11 +14,12 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import common.TestType;
 
 /**
- * Los nombres de los decortadores relacionados con la BBDD pueden estar 
- * en camelCase, snakeCase o como se quiera, puesto que en persistence.xml
- * se tiene dicho que se convierta a minúsculas.
+ * Los nombres de los decortadores relacionados con la BBDD pueden estar en
+ * camelCase, snakeCase o como se quiera, puesto que en persistence.xml se tiene
+ * dicho que se convierta a minúsculas.
  * 
  * Lo uso en minúsculas para mejorar la trazabilidad de los campos.
  * 
@@ -30,29 +33,30 @@ public class MedicalTestJPA implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private int id;
 	private Date date;
 	private long time;
 	private String observations;
 	private String highresimage;
-	@Column(name = "type") // Con esto podríamos cambiar los nombres de las propiedades de la clase y mantener la relación con la BBDD a través de JPA
-	private int type;
-	
+	@Enumerated(EnumType.STRING)
+	@Column(name = "type") // Con esto podríamos cambiar los nombres de las propiedades de la clase y
+							// mantener la relación con la BBDD a través de JPA
+	private TestType type;
+
 	@ManyToOne
-	@JoinColumn (name="patientid")
+	@JoinColumn(name = "patientid")
 	private PatientJPA patient;
-	
+
 	@ManyToOne
-	@JoinColumn (name="specialistdoctorid")
+	@JoinColumn(name = "specialistdoctorid")
 	private SpecialistDoctorJPA specialistDoctor;
 
 	public MedicalTestJPA() {
 		super();
 	}
-	
-	public MedicalTestJPA(int id, Date date, long time, String observations, String highresimage, int type,
-			PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
+
+	public MedicalTestJPA(int id, Date date, long time, String observations, String highresimage, TestType type, PatientJPA patient, SpecialistDoctorJPA specialistDoctor) {
 		this.id = id;
 		this.date = date;
 		this.time = time;
@@ -103,11 +107,11 @@ public class MedicalTestJPA implements Serializable {
 		this.highresimage = highresimage;
 	}
 
-	public int getType() {
+	public TestType getType() {
 		return type;
 	}
 
-	public void setType(int type) {
+	public void setType(TestType type) {
 		this.type = type;
 	}
 
@@ -127,6 +131,4 @@ public class MedicalTestJPA implements Serializable {
 		this.specialistDoctor = specialistDoctor;
 	}
 
-	
-
 }
diff --git a/1.sources/MyHealth/src/jpa/QuestionJPA.java b/1.sources/MyHealth/src/jpa/QuestionJPA.java
index fb3130d..3b5f826 100644
--- a/1.sources/MyHealth/src/jpa/QuestionJPA.java
+++ b/1.sources/MyHealth/src/jpa/QuestionJPA.java
@@ -3,6 +3,8 @@ package jpa;
 import java.io.Serializable;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -29,28 +31,28 @@ public class QuestionJPA implements Serializable {
 	private int id;
 	private String title;
 	private String message;
+	@Enumerated(EnumType.STRING)
 	private QuestionStatus status;
 	private String response;
 
 	@ManyToOne
 	@JoinColumn(name = "patientid")
 	private PatientJPA patient;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "familydoctorid")
-	private FamilyDoctorJPA familydoctor;
+	private FamilyDoctorJPA familyDoctor;
 
 	public QuestionJPA() {
 	}
 
-	public QuestionJPA(int id, String title, String message, QuestionStatus status, PatientJPA patient,
-			FamilyDoctorJPA familydoctor, String response) {
+	public QuestionJPA(int id, String title, String message, QuestionStatus status, PatientJPA patient, FamilyDoctorJPA familydoctor, String response) {
 		this.id = id;
 		this.title = title;
 		this.message = message;
 		this.status = status;
 		this.patient = patient;
-		this.familydoctor = familydoctor;
+		this.familyDoctor = familydoctor;
 		this.response = response;
 	}
 
@@ -94,12 +96,12 @@ public class QuestionJPA implements Serializable {
 		this.status = status;
 	}
 
-	public FamilyDoctorJPA getDoctor() {
-		return familydoctor;
+	public FamilyDoctorJPA getFamilyDoctor() {
+		return familyDoctor;
 	}
 
-	public void setDoctor(FamilyDoctorJPA familydoctor) {
-		this.familydoctor = familydoctor;
+	public void setFamilyDoctor(FamilyDoctorJPA familyDoc) {
+		this.familyDoctor = familyDoc;
 	}
 
 	public String getResponse() {
diff --git a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
index 945a532..3c1c34e 100644
--- a/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
+++ b/1.sources/MyHealth/src/managedbean/common/AuthorizationFilter.java
@@ -2,11 +2,9 @@
 package managedbean.common;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.List;
 
 import javax.faces.application.FacesMessage;
+import javax.persistence.PersistenceException;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -18,10 +16,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.primefaces.model.menu.DefaultSeparator;
-import org.primefaces.model.menu.DefaultSubMenu;
+import org.omnifaces.util.Exceptions;
 
 import common.UserType;
+import common.Utils;
 
 @WebFilter(filterName = "AuthFilter", urlPatterns = { "*.xhtml" })
 public class AuthorizationFilter implements Filter {
@@ -34,25 +32,47 @@ public class AuthorizationFilter implements Filter {
 
 	}
 
+	private boolean isAJAXRequest(HttpServletRequest request) {
+		boolean check = false;
+		String facesRequest = request.getHeader("Faces-Request");
+		if (facesRequest != null && facesRequest.equals("partial/ajax")) {
+			check = true;
+		}
+		return check;
+	}
+
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		HttpServletRequest req = null;
+		HttpServletResponse resp = null;
+		HttpSession ses = null;
 		try {
 
-			HttpServletRequest req = (HttpServletRequest) request;
-			HttpServletResponse resp = (HttpServletResponse) response;
-			HttpSession ses = req.getSession(false);
-
+			req = (HttpServletRequest) request;
 			String reqURI = req.getRequestURI();
 
-			// Para recursos publicos permitimos el acceso
+			resp = (HttpServletResponse) response;
+			ses = req.getSession(false);
+
+			// Para recursos publicos permitimos el acceso exista sesión o no.
 			if (reqURI.indexOf("/login.xhtml") >= 0 || reqURI.indexOf("/profile/RegisterUser.xhtml") >= 0 || reqURI.indexOf("/home.xhtml") >= 0
 					|| reqURI.indexOf("/error.xhtml") >= 0 || reqURI.indexOf("/public/") >= 0 || reqURI.contains("javax.faces.resource")) {
 				chain.doFilter(request, response);
 				return;
 			}
 
-			// Si el usuario está logeado comprobamos si está autorizado a ver la página
-			// solicitada.
+			if (this.isAJAXRequest(req) == true) {
+				chain.doFilter(request, response);
+				return;
+			}
+
+			// Sesión expirada
+			if (req.isRequestedSessionIdValid() == false && req.getRequestedSessionId() != null) {
+				resp.sendRedirect(req.getContextPath() + "/error.xhtml?type=expired");
+				return;
+			}
+
+			// Si el usuario está logeado comprobamos si está autorizado a ver la página solicitada.
 			if (SessionUtils.isLogedIn(ses) == true) {
 				UserType tipoUsuario = SessionUtils.getUserType(ses);
 				boolean authorized = false;
@@ -130,21 +150,29 @@ public class AuthorizationFilter implements Filter {
 					chain.doFilter(request, response);
 					return;
 				} else {
-					SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR, "No está autorizado a acceder a la página solicitada. Por favor, utilice el menú principal de la aplicación.", String.format("Se ha producido una expción de autorización, su usuario no está autorizado a acceder a la página: (%s).", reqURI));
+					SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR,
+							"No está autorizado a acceder a la página solicitada. Por favor, utilice el menú principal de la aplicación.",
+							String.format("Se ha producido una expción de autorización, su usuario no está autorizado a acceder a la página: (%s).", reqURI));
 					resp.sendRedirect(req.getContextPath() + "/error.xhtml?type=auth");
 					return;
 				}
 
 			}
 
-			resp.sendRedirect(req.getContextPath() + "/login.xhtml");
+			resp.sendRedirect(req.getContextPath() + "/home.xhtml");
 		} catch (Exception e) {
-			System.out.println(e.getMessage());
+			if (Exceptions.is(e, PersistenceException.class) == true) {
+				if (ses != null)
+					SessionUtils.addMessage(ses, FacesMessage.SEVERITY_ERROR, "Error al intentar acceder a la base de datos", Utils.getExceptionRootCause(e).getLocalizedMessage());
+
+				resp.sendRedirect(req.getContextPath() + "/error.xhtml?type=sql");
+			} else
+				resp.sendRedirect(req.getContextPath() + "/error.xhtml");
 		}
 	}
 
 	@Override
 	public void destroy() {
-
+		System.out.println("Sessión destruida");
 	}
 }
diff --git a/1.sources/MyHealth/src/managedbean/common/ManagedBeanBase.java b/1.sources/MyHealth/src/managedbean/common/ManagedBeanBase.java
index 74ac0dd..f36cc00 100644
--- a/1.sources/MyHealth/src/managedbean/common/ManagedBeanBase.java
+++ b/1.sources/MyHealth/src/managedbean/common/ManagedBeanBase.java
@@ -1,9 +1,12 @@
 package managedbean.common;
 
+import java.io.IOException;
 import java.util.Properties;
 
 import javax.ejb.EJB;
 import javax.faces.application.FacesMessage;
+import javax.faces.application.ViewExpiredException;
+import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -103,7 +106,7 @@ public class ManagedBeanBase {
 	protected void addFacesMessage(FacesMessage.Severity severity, String summary, String detail) {
 		this.addFacesMessage(FacesContext.getCurrentInstance(), null, severity, summary, detail);
 	}
-	
+
 	protected void addFacesMessage(String clientId, FacesMessage.Severity severity, String summary, String detail) {
 		this.addFacesMessage(FacesContext.getCurrentInstance(), clientId, severity, summary, detail);
 	}
@@ -111,16 +114,34 @@ public class ManagedBeanBase {
 	protected void addFacesMessage(FacesContext context, String clientId, FacesMessage.Severity severity, String summary, String detail) {
 		this.addFacesMessage(context, clientId, new FacesMessage(severity, summary, detail));
 	}
-	
+
 	protected void addFacesMessage(FacesMessage facesMsg, String clientId) {
 		this.addFacesMessage(FacesContext.getCurrentInstance(), clientId, facesMsg);
 	}
-	
+
 	protected void addFacesMessage(FacesContext context, String clientId, FacesMessage facesMsg) {
 		context.addMessage(clientId, facesMsg);
 	}
 
 	protected void manageException(Exception ex) {
-		this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Se ha producido un error inesperado", "Descripción del error: " + ex.getLocalizedMessage());
+		String strType = "";
+
+		if (ex.getClass().equals(ViewExpiredException.class)) {
+			// Sessión expired
+			strType = "expired";
+			this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Su sesión ha caducado", "Su sesión ha caducado, vuelva a logarse en el sistema.");
+		} else {
+			this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Se ha producido un error inesperado", "Descripción del error: " + ex.getLocalizedMessage());
+		}
+
+		
+		try {
+			ExternalContext ctx = FacesContext.getCurrentInstance().getExternalContext();
+			
+			ctx.redirect(ctx.getApplicationContextPath() + "/error.xhtml?type=" + strType);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 	}
 }
diff --git a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
index 35c1b7e..341963d 100644
--- a/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
+++ b/1.sources/MyHealth/src/managedbean/common/MenuMBean.java
@@ -4,8 +4,6 @@ import java.io.Serializable;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
 import javax.inject.Named;
 
 import org.primefaces.model.menu.DefaultMenuItem;
@@ -104,7 +102,7 @@ public class MenuMBean implements Serializable {
 					subMenu.addElement(createMenuItem("Responder pregunta", "fa fa-comments", "/medicaltest/MedicalTests", null));
 
 				if (tipoUsuario == UserType.FAMILY_DOCTOR)
-					subMenu.addElement(createMenuItem("Ver preguntas pendientes", "fa fa-comments-o", "/medicaltest/MedicalTests", null));
+					subMenu.addElement(createMenuItem("Ver preguntas pendientes", "fa fa-comments-o", "/medicaltest/PendingQuestions", null));
 
 				model.addElement(subMenu);
 			}
diff --git a/1.sources/MyHealth/src/managedbean/common/ThemeService.java b/1.sources/MyHealth/src/managedbean/common/ThemeService.java
index de7c7d5..9b19661 100644
--- a/1.sources/MyHealth/src/managedbean/common/ThemeService.java
+++ b/1.sources/MyHealth/src/managedbean/common/ThemeService.java
@@ -1,16 +1,16 @@
 package managedbean.common;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ThemeService {
-	/**
-	 * 
-	 */
+public class ThemeService  implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	public static final String DEFAULT_THEME = "nova-light";
 	public static final List<Theme> THEMES = new ArrayList<Theme>() {
+		private static final long serialVersionUID = 1L;
+
 		{
 			int i = 1;
 			add(new Theme(i++, "afterdark", "afterdark"));
diff --git a/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java b/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java
index d147b8e..e66ae0a 100644
--- a/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java
+++ b/1.sources/MyHealth/src/managedbean/common/ValidationUtils.java
@@ -69,7 +69,10 @@ public class ValidationUtils {
 	 */
 	public static boolean checkIfNifAlreadyRegistered(CommonFacadeRemote remoteSvc, UserType userType, String nif, Integer id) {
 		boolean nifExists = false;
-
+		
+		if (userType == null || remoteSvc == null)
+			return nifExists;
+		
 		switch (userType) {
 		case ADMINISTRATOR:
 			break;
@@ -82,7 +85,7 @@ public class ValidationUtils {
 				// para los especialistas
 				SpecialistDoctorTO sd = remoteSvc.findSpecialistDoctorByNif(nif);
 
-				if (sd != null && (id == null || fd.getId() != id))
+				if (sd != null && (id == null || sd.getId() != id))
 					nifExists = true;
 			} else if (id == null || fd.getId() != id)
 				// Si se trata de un usuario diferente, entonces está repetido
diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java
index f14f4e7..2396638 100644
--- a/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java
+++ b/1.sources/MyHealth/src/managedbean/medicalTest/MedicalTestMBean.java
@@ -1,51 +1,27 @@
 package managedbean.medicalTest;
 
 import java.io.Serializable;
-import java.util.Properties;
 
-import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
 
-import ejb.medicalTest.MedicalTestFacadeRemote;
+import managedbean.common.ManagedBeanBase;
 
-/**
- * ManagedBEan que gestiona la edición y actualización de una especialidad
- * médica.
- * 
- * @author mark
- *
- */
 @Named("MedicalTestMBean")
 @RequestScoped
-public class MedicalTestMBean implements Serializable {
+public class MedicalTestMBean extends ManagedBeanBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@EJB
-	private MedicalTestFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public MedicalTestMBean() throws Exception {
-		initializeAdminFacadeRemote();
+	public MedicalTestMBean() {
 	}
 
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	private void initializeAdminFacadeRemote() throws Exception {
-		Properties props = System.getProperties();
-		Context ctx = new InitialContext(props);
-		remoteManager = (MedicalTestFacadeRemote) ctx
-				.lookup("java:app/myHealth.jar/MedicalTestFacadeBean!ejb.component.MedicalTestFacadeRemote");
-	}
+	@PostConstruct
+	public void init() {
+		// Inicialización de variables y propiedades van aquí.
 
+		// Como realizar llamadas al EJB Remoto
+		// this.getRemoteManagerSystemAdmin().MetodoEJB
+	}
 }
diff --git a/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java b/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java
new file mode 100644
index 0000000..f179753
--- /dev/null
+++ b/1.sources/MyHealth/src/managedbean/medicalTest/PendingQuestionsMBean.java
@@ -0,0 +1,55 @@
+package managedbean.medicalTest;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.faces.view.ViewScoped;
+import javax.inject.Named;
+
+import org.primefaces.model.LazyDataModel;
+import org.primefaces.model.SortOrder;
+
+import TO.QuestionTO;
+import managedbean.common.ManagedBeanBase;
+import managedbean.common.SessionUtils;
+
+@Named("PendingQuestions")
+@ViewScoped
+public class PendingQuestionsMBean extends ManagedBeanBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private int familyDoctorId;
+	private LazyDataModel<QuestionTO> lazyDataModelQuestionList;
+
+	public PendingQuestionsMBean() {
+	}
+
+	@PostConstruct
+	public void init() {
+		// Inicialización de variables y propiedades van aquí.
+		this.familyDoctorId = Integer.valueOf(SessionUtils.getUserId());
+
+		this.lazyDataModelQuestionList = new LazyDataModel<QuestionTO>() {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public List<QuestionTO> load(int first, int pageSize, String sortField, SortOrder sortOrder, Map<String, Object> filters) {
+				Long totalRowCount = getRemoteManagerMedicalTest().getPendingQuestionsCount(familyDoctorId);
+				this.setRowCount(totalRowCount.intValue());
+
+				return getRemoteManagerMedicalTest().listPendingQuestionsPaged(familyDoctorId, (first / pageSize), pageSize);
+			}
+		};
+	}
+
+	public LazyDataModel<QuestionTO> getLazyDataModelQuestionList() {
+		return lazyDataModelQuestionList;
+	}
+	
+	public void saveData() {
+	
+	}
+}
diff --git a/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java b/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java
index 463af12..0a37d0e 100644
--- a/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/ChangeFamilyDoctorMBean.java
@@ -84,12 +84,13 @@ public class ChangeFamilyDoctorMBean extends ManagedBeanBase implements Serializ
 		int error = 0;
 
 		if (this.getNewFamilyDoctor() == null) {
-			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Nuevo médico de familia no seleccionado", "Por favor, especifique un nuevvo médico de familia.");
+			this.addFacesMessage("frmChangeFD:newFamilyDocAC", FacesMessage.SEVERITY_WARN, "Nuevo médico de familia no seleccionado",
+					"Por favor, especifique un nuevvo médico de familia.");
 			error++;
 		}
 
 		if (this.getCurrentFamilyDoctor() != null && this.getNewFamilyDoctor().getId() == this.getCurrentFamilyDoctor().getId()) {
-			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "El médico de familia debe ser diferente",
+			this.addFacesMessage("frmChangeFD:newFamilyDocAC", FacesMessage.SEVERITY_WARN, "El médico de familia debe ser diferente",
 					"Por favor, seleccione un médico de familia diferente al que tiene actualmente asignado.");
 			error++;
 		}
diff --git a/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java b/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java
index f0c6107..8235389 100644
--- a/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/ChangePrimaryHealthCareCenterMBean.java
@@ -1,7 +1,6 @@
 package managedbean.profile;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.List;
 
 import javax.annotation.PostConstruct;
@@ -86,12 +85,12 @@ public class ChangePrimaryHealthCareCenterMBean extends ManagedBeanBase implemen
 		int error = 0;
 
 		if (this.getNewCenter() == null) {
-			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Centro de atención primaria no seleccionado", "Por favor, especifique un nuevvo centro de atención primaria.");
+			this.addFacesMessage("frmChangePHCC:newCenter", FacesMessage.SEVERITY_WARN, "Centro de atención primaria no seleccionado", "Por favor, especifique un nuevvo centro de atención primaria.");
 			error++;
 		}
 
 		if (this.getNewCenter().getName().equals(this.getCurrentCenter().getName())) {
-			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "El centro de atención primeria debe ser diferente", "Por favor, seleccione un centro de atención primaria diferente al cual está actualmente asignado.");
+			this.addFacesMessage("frmChangePHCC:newCenter", FacesMessage.SEVERITY_WARN, "El centro de atención primeria debe ser diferente", "Por favor, seleccione un centro de atención primaria diferente al cual está actualmente asignado.");
 			error++;
 		}
 
diff --git a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
index 60896c1..c6da8ab 100644
--- a/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/RegisterUserMBean.java
@@ -129,8 +129,13 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable {
 	}
 	
 	public void hadleNIFValueChange() {
-		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, null) == true)
+		boolean isDupe = false;
+		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, null) == true) {
+			isDupe = true;	
 			this.addFacesMessage("frmRegisterUser:nif", FacesMessage.SEVERITY_WARN, "NIF duplicado", "El nif indicado pertenece a otro usuario previamente registrado");
+		}
+		
+		PrimeFaces.current().ajax().addCallbackParam("NIFisDupe", isDupe);
 	}
 
 	public boolean isPatient() {
@@ -193,11 +198,11 @@ public class RegisterUserMBean extends ManagedBeanBase implements Serializable {
 		int error = 0;
 
 		if (this.isFamilyDoctor() && this.primaryHealthCareCenter == null) {
-			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Centro de atención primaria no seleccionado", "Por favor, especifique un centro de atención primaria.");
+			this.addFacesMessage("frmRegisterUser:selPHC", FacesMessage.SEVERITY_WARN, "Centro de atención primaria no seleccionado", "Por favor, especifique un centro de atención primaria.");
 			error++;
 		}
 		if (this.isSpecialistDoctor() && this.medicalSpecialty == null) {
-			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Especialidad médica no seleccionada", "Por favor, especifique una especialidad médica.");
+			this.addFacesMessage("frmRegisterUser:selMS", FacesMessage.SEVERITY_WARN, "Especialidad médica no seleccionada", "Por favor, especifique una especialidad médica.");
 			error++;
 		}
 		if (ValidationUtils.isValid(nif) == false) {
diff --git a/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java b/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
index 3434842..b7dc4c7 100644
--- a/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
+++ b/1.sources/MyHealth/src/managedbean/profile/UpdateProfileMBean.java
@@ -113,7 +113,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 		this.id = pat.getId();
 		this.cipCode = pat.getPersonalIdentificationCode();
 		this.name = pat.getName();
-		this.surname = pat.getName();
+		this.surname = pat.getSurname();
 		this.nif = pat.getNif();
 		this.email = pat.getEmail();
 		this.currentPassword = pat.getPassword();
@@ -124,7 +124,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 		this.id = fd.getId();
 		this.cipCode = fd.getProfessionalNumber();
 		this.name = fd.getName();
-		this.surname = fd.getName();
+		this.surname = fd.getSurname();
 		this.nif = fd.getNif();
 		this.email = fd.getEmail();
 		this.currentPassword = fd.getPassword();
@@ -135,7 +135,7 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 		this.id = sd.getId();
 		this.cipCode = sd.getProfessionalNumber();
 		this.name = sd.getName();
-		this.surname = sd.getName();
+		this.surname = sd.getSurname();
 		this.nif = sd.getNif();
 		this.email = sd.getEmail();
 		this.currentPassword = sd.getPassword();
@@ -173,8 +173,13 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 	}
 
 	public void hadleNIFValueChange() {
-		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, this.id) == true)
+		boolean isDupe = false;
+		if (ValidationUtils.checkIfNifAlreadyRegistered(this.getRemoteManagerCommon(), this.userType, this.nif, this.id) == true) {
+			isDupe = true;	
 			this.addFacesMessage("frmUpdateProfile:nif", FacesMessage.SEVERITY_WARN, "NIF duplicado", "El nif indicado pertenece a otro usuario previamente registrado");
+		}
+		
+		PrimeFaces.current().ajax().addCallbackParam("NIFisDupe", isDupe);		
 	}
 	
 	public List<FamilyDoctorTO> getFamilyDoctorList() {
@@ -252,6 +257,11 @@ public class UpdateProfileMBean extends ManagedBeanBase implements Serializable
 
 	public void saveData() {
 		int error = 0;
+		
+		// Si no hay tipo de usuario, es que algo raro ha pasado (sesión caducada?). salimos.
+		if (this.userType == null)
+			return;
+		
 		boolean changePassword = (this.oldPassword != null && this.oldPassword.equals("") == false) || (this.password != null && this.password.equals("") == false);
 
 		if (this.isUserTypeFamilyDoctor() && this.primaryHealthCareCenter == null) {
diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
index f86bf7e..5674f25 100644
--- a/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
+++ b/1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
@@ -1,19 +1,12 @@
 package managedbean.systemAdmin;
 
-import java.util.Properties;
-
 import javax.enterprise.context.RequestScoped;
 import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.servlet.http.HttpSession;
 
 import org.primefaces.PrimeFaces;
 
 import TO.LoggedUserTO;
-import ejb.systemAdmin.SystemAdminFacadeRemote;
 import managedbean.common.ManagedBeanBase;
 import managedbean.common.SessionUtils;
 
@@ -42,10 +35,11 @@ public class LoginMBean extends ManagedBeanBase {
 
 	public String login() {
 		boolean loggedIn = false;
+		String viewRedirect = "";
 
 		LoggedUserTO usr = null;
 
-		if (username != null && password != null) {
+		if (username != null && password != null && username.equals("") == false && password.equals("") == false) {
 			try {
 				usr = this.getRemoteManagerSystemAdmin().login(username, password);
 
@@ -54,8 +48,7 @@ public class LoginMBean extends ManagedBeanBase {
 					SessionUtils.CreateSession(usr);
 
 					this.addFacesMessageKeep(FacesMessage.SEVERITY_INFO, "Login correcto", "Bienvenido " + usr.getName());
-
-					return ("/home?faces-redirect=true");
+					viewRedirect = "/home?faces-redirect=true";
 				} else
 					this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
 			} catch (Exception ex) {
@@ -66,8 +59,7 @@ public class LoginMBean extends ManagedBeanBase {
 			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
 
 		PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn);
-
-		return "";
+		return viewRedirect;
 	}
 
 	// logout event, invalidate session
diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java
new file mode 100644
index 0000000..c225f76
--- /dev/null
+++ b/1.sources/MyHealth/src/managedbean/systemAdmin/ManageSpecialitiesMBean.java
@@ -0,0 +1,162 @@
+package managedbean.systemAdmin;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.annotation.PostConstruct;
+import javax.enterprise.context.RequestScoped;
+import javax.faces.application.FacesMessage;
+import javax.inject.Named;
+
+import TO.LoggedUserTO;
+import TO.MedicalSpecialtyTO;
+import common.Constants;
+import managedbean.common.ManagedBeanBase;
+import managedbean.common.SessionUtils;
+
+@Named("ManageSpecialities")
+@RequestScoped
+public class ManageSpecialitiesMBean extends ManagedBeanBase implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	
+	private Integer id;
+	private String name;
+	private String description;
+	private MedicalSpecialtyTO medicalSpecialty;
+	private List<MedicalSpecialtyTO> medicalSpecialitiesList;
+
+	public ManageSpecialitiesMBean() {
+	}
+
+	@PostConstruct
+	public void init() {
+		if (this.medicalSpecialty == null) {
+			this.medicalSpecialty = new MedicalSpecialtyTO();
+		}
+		// Recuperamos el usuario logeado actual
+		LoggedUserTO usr = null;
+		try {
+			usr = SessionUtils.getloggedOnUser();
+
+			if (usr == null)
+				this.addFacesMessage(FacesMessage.SEVERITY_ERROR, "Sesión no válida",
+						"Su sesión actual no es válida, por favor cierre su sesión y vuelva a logearse en el sistema.");
+			else {
+				this.medicalSpecialitiesList = this.getRemoteManagerCommon().listMedicalSpecialitiesPaged(0, Constants.MAX_ITEMS_AUTOCOMPLETE_SEARCH);
+			}
+		} catch (Exception e) {
+			this.manageException(e);
+		}
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	private void setSpecialtyData(MedicalSpecialtyTO ms) {
+		this.id = ms.getId();
+		this.name = ms.getName();
+		this.description = ms.getDescription();
+	}
+	
+	public List<MedicalSpecialtyTO> getMedicalSpecialtiesList() {
+		return medicalSpecialitiesList;
+	}
+
+	public MedicalSpecialtyTO getMedicalSpecialty() {
+		return medicalSpecialty;
+	}
+
+	public void setMedicalSpecialty(MedicalSpecialtyTO value) {
+		this.medicalSpecialty = value;
+	}
+	
+	public void saveData() {
+		int error = 0;
+
+		if (this.medicalSpecialty.getName() == null) {
+			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Nombre no relleno", "Por favor, escriba un nombre de especialidad.");
+			error++;
+		}
+		if (this.medicalSpecialty.getDescription() == null) {
+			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Descripción no rellena", "Por favor, escriba una descripción.");
+			error++;
+		}
+
+		if (error == 0) {
+			try {
+				MedicalSpecialtyTO ms = this.getRemoteManagerSystemAdmin().updateSpecialtyData(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(), this.medicalSpecialty.getDescription());
+				this.setSpecialtyData(ms);
+				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los datos se han guardado", "Los datos de la especialidad se han guardado correctamente.");
+			} catch (Exception e) {
+				this.manageException(e);
+			}
+		}
+	}
+	
+	public void deleteData() {
+		int error = 0;
+
+		if (this.medicalSpecialty.getName() == null) {
+			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Nombre no relleno", "Por favor, escriba un nombre de especialidad.");
+			error++;
+		}
+		if (this.medicalSpecialty.getDescription() == null) {
+			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Descripción no rellena", "Por favor, escriba una descripción.");
+			error++;
+		}
+
+		if (error == 0) {
+			try {
+				this.getRemoteManagerSystemAdmin().deleteSpecialtyData(this.medicalSpecialty.getId(), this.medicalSpecialty.getName(), this.medicalSpecialty.getDescription());
+				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los especialidad se ha borrado", "Los datos de la especialidad se han borrado correctamente.");
+			} catch (Exception e) {
+				this.manageException(e);
+			}
+		}
+	}
+
+	public void insertData() {
+		int error = 0;
+
+		if (name == null || name.trim().length() == 0) {
+			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Nombre no relleno", "Por favor, escriba un nombre de especialidad.");
+			error++;
+		}
+		if (description == null || description.trim().length() == 0) {
+			this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Descripción no rellena", "Por favor, escriba una descripción.");
+			error++;
+		}
+
+		if (error == 0) {
+			try {
+				MedicalSpecialtyTO ms = this.getRemoteManagerSystemAdmin().insertSpecialtyData(name, description);
+				this.setSpecialtyData(ms);
+				this.addFacesMessage(FacesMessage.SEVERITY_INFO, "Los datos se han guardado", "Los datos de la especialidad se han guardado correctamente.");
+			} catch (Exception e) {
+				this.manageException(e);
+			}
+		}
+	}
+}
diff --git a/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java b/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java
deleted file mode 100644
index 5d7eb33..0000000
--- a/1.sources/MyHealth/src/managedbean/systemAdmin/SystemAdminMBean.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package managedbean.systemAdmin;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import javax.ejb.EJB;
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import ejb.systemAdmin.SystemAdminFacadeRemote;
-
-/**
- * ManagedBEan que gestiona la edición y actualización de una especialidad
- * médica.
- * 
- * @author mark
- *
- */
-@Named("SystemAdminMBean")
-@RequestScoped
-public class SystemAdminMBean implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@EJB
-	private SystemAdminFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public SystemAdminMBean() throws Exception {
-		initializeAdminFacadeRemote();
-	}
-
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	private void initializeAdminFacadeRemote() throws Exception {
-		Properties props = System.getProperties();
-		Context ctx = new InitialContext(props);
-		remoteManager = (SystemAdminFacadeRemote) ctx.lookup("java:app/myHealth.jar/ClassFacadeBean!ejb.component.SystemAdminFacadeRemote");
-	}
-
-}
diff --git a/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java b/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java
index f6d2fcc..b866476 100644
--- a/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java
+++ b/1.sources/MyHealth/src/managedbean/validators/EmailValidator.java
@@ -14,12 +14,12 @@ import javax.faces.validator.ValidatorException;
 import org.primefaces.validate.ClientValidator;
 
 @FacesValidator("emailValidator")
-public class EmailValidator implements Validator, ClientValidator {
+public class EmailValidator implements Validator<String>, ClientValidator {
 
 	private final static String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
 	private final static Pattern EMAIL_COMPILED_PATTERN = Pattern.compile(EMAIL_PATTERN);
 
-	public void validate(FacesContext context, UIComponent comp, Object value) throws ValidatorException {
+	public void validate(FacesContext context, UIComponent comp, String value) throws ValidatorException {
 		String strValue = "";
 		
 		if (value != null)
diff --git a/1.sources/MyHealth/src/managedbean/validators/NifValidator.java b/1.sources/MyHealth/src/managedbean/validators/NifValidator.java
index c663919..e0ad8dc 100644
--- a/1.sources/MyHealth/src/managedbean/validators/NifValidator.java
+++ b/1.sources/MyHealth/src/managedbean/validators/NifValidator.java
@@ -14,9 +14,9 @@ import org.primefaces.validate.ClientValidator;
 import managedbean.common.ValidationUtils;
 
 @FacesValidator("nifValidator")
-public class NifValidator implements Validator, ClientValidator {
+public class NifValidator implements Validator<String>, ClientValidator {
 
-	public void validate(FacesContext context, UIComponent comp, Object value) throws ValidatorException {
+	public void validate(FacesContext context, UIComponent comp, String value) throws ValidatorException {
 		String strValue = "";
 		
 		if (value != null)
diff --git a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
index 9c32df4..22a4920 100644
--- a/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
+++ b/1.sources/MyHealth/src/managedbean/visit/VisitMBean.java
@@ -1,50 +1,28 @@
 package managedbean.visit;
 
 import java.io.Serializable;
-import java.util.Properties;
 
-import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
-import javax.naming.Context;
-import javax.naming.InitialContext;
 
-import ejb.visit.VisitFacadeRemote;
+import managedbean.common.ManagedBeanBase;
 
-/**
- * ManagedBEan que gestiona la edición y actualización de una especialidad
- * médica.
- * 
- * @author mark
- *
- */
 @Named("VisitMBean")
 @RequestScoped
-public class VisitMBean implements Serializable {
+public class VisitMBean extends ManagedBeanBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@EJB
-	private VisitFacadeRemote remoteManager;
-
-	/**
-	 * Constructor. Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	public VisitMBean() throws Exception {
-		initializeAdminFacadeRemote();
+	public VisitMBean() {
 	}
 
-	/**
-	 * Inicializa la conexión con el EJB Remoto
-	 * 
-	 * @throws Exception
-	 */
-	private void initializeAdminFacadeRemote() throws Exception {
-		Properties props = System.getProperties();
-		Context ctx = new InitialContext(props);
-		remoteManager = (VisitFacadeRemote) ctx.lookup("java:app/myHealth.jar/ClassFacadeBean!ejb.component.VisitFacadeRemote");
+	@PostConstruct
+	public void init() {
+		// Inicialización de variables y propiedades van aquí.
+
+		// Como realizar llamadas al EJB Remoto
+		// this.getRemoteManagerSystemAdmin().MetodoEJB
 	}
 
 }
diff --git a/2.database/01.CreateTables.sql b/2.database/01.CreateTables.sql
index cb84533..fb5935a 100644
--- a/2.database/01.CreateTables.sql
+++ b/2.database/01.CreateTables.sql
@@ -83,7 +83,6 @@ CREATE SEQUENCE myhealth.codigoidentificacionpaciente
     CACHE 1;
 
 -- Table: myhealth.administrator
--- DROP TABLE myhealth.administrator;
 CREATE TABLE myhealth.administrator
 (
     email VARCHAR(120) COLLATE pg_catalog."default" NOT NULL,
@@ -92,13 +91,7 @@ CREATE TABLE myhealth.administrator
 )
 TABLESPACE pg_default;
 
-ALTER TABLE myhealth.administrator
-    OWNER to "USER";
-
 -- Table: myhealth.primaryhealthcarecenter
-
--- DROP TABLE myhealth.primaryhealthcarecenter;
-
 CREATE TABLE myhealth.primaryhealthcarecenter
 (
 	id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -108,13 +101,7 @@ CREATE TABLE myhealth.primaryhealthcarecenter
 )
 TABLESPACE pg_default;
 
-ALTER TABLE myhealth.primaryhealthcarecenter
-    OWNER to "USER";
-
 -- Table: myhealth.familydoctor
-
--- DROP TABLE myhealth.familydoctor;
-
 CREATE TABLE myhealth.familydoctor
 (
     id integer NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -132,13 +119,7 @@ TABLESPACE pg_default;
 CREATE UNIQUE INDEX family_doctor_professionaln_index
     ON myhealth.familydoctor (professionalnumber);
 
-ALTER TABLE myhealth.familydoctor
-    OWNER to "USER";
-
 -- Table: myhealth.medicalspecialty
-
--- DROP TABLE myhealth.medicalspecialty;
-
 CREATE TABLE myhealth.medicalspecialty
 (
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -147,14 +128,8 @@ CREATE TABLE myhealth.medicalspecialty
     CONSTRAINT medicalspecialty_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;
-
-ALTER TABLE myhealth.medicalspecialty
-    OWNER to "USER";
-    
--- Table: myhealth.patient
-
--- DROP TABLE myhealth.patient;
-
+   
+-- Table: myhealth.patient 
 CREATE TABLE myhealth.patient
 (
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -172,13 +147,7 @@ TABLESPACE pg_default;
 CREATE UNIQUE INDEX patient_pic_index
     ON myhealth.patient (personalIdentificationCode);
 
-ALTER TABLE myhealth.patient
-    OWNER to "USER";
-
 -- Table: myhealth.specialistdoctor
-
--- DROP TABLE myhealth.specialistdoctor;
-
 CREATE TABLE myhealth.specialistdoctor
 (
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -196,13 +165,7 @@ TABLESPACE pg_default;
 CREATE UNIQUE INDEX specialistdoctor_professionaln_index
     ON myhealth.specialistdoctor (professionalnumber);
 
-ALTER TABLE myhealth.specialistdoctor
-    OWNER to "USER";
-
 -- Table: myhealth.visit
-
--- DROP TABLE myhealth.visit;
-
 CREATE TABLE myhealth.visit
 (
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
@@ -216,49 +179,56 @@ CREATE TABLE myhealth.visit
 )
 TABLESPACE pg_default;
 
-ALTER TABLE myhealth.visit
-    OWNER to "USER";
-
 -- Table: myhealth.question
-
--- DROP TABLE myhealth.question;
-
 CREATE TABLE myhealth.question
 (
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
     title VARCHAR(512) COLLATE pg_catalog."default" NOT NULL,
     message TEXT COLLATE pg_catalog."default" NOT NULL,
-    status INTEGER,
+    status VARCHAR(20) NOT NULL,
     response TEXT COLLATE pg_catalog."default",
-    patientid INTEGER REFERENCES myhealth.patient(id),
-    familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
+    patientid INTEGER REFERENCES myhealth.patient(id) NOT NULL,
+    familydoctorid INTEGER REFERENCES myhealth.familydoctor(id) NOT NULL,
     CONSTRAINT question_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;
 
-ALTER TABLE myhealth.question
-    OWNER to "USER";
-
 -- Table: myhealth.medicaltest
-
--- DROP TABLE myhealth.medicaltest;
-
 CREATE TABLE myhealth.medicaltest
 (
     id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
-    date DATE,
-    "time" TIME,
+    date DATE NOT NULL,
+    "time" TIME NOT NULL,
     observations TEXT COLLATE pg_catalog."default",
-    highresimage bytea,
-    type INTEGER,
-    patientid INTEGER REFERENCES myhealth.patient(id),
-    specialistdoctorid INTEGER REFERENCES myhealth.specialistdoctor(id),
+    highresimage TEXT,
+    type VARCHAR(30) NOT NULL,
+    patientid INTEGER REFERENCES myhealth.patient(id) NOT NULL,
+    specialistdoctorid INTEGER REFERENCES myhealth.specialistdoctor(id) NOT NULL,
     CONSTRAINT medicaltest_pkey PRIMARY KEY (id)
 )
 TABLESPACE pg_default;
 
-ALTER TABLE myhealth.medicaltest
-    OWNER to "USER";
+-- Permisos
+ALTER TABLE myhealth.administrator              OWNER to "USER";
+ALTER TABLE myhealth.primaryhealthcarecenter    OWNER to "USER";
+ALTER TABLE myhealth.familydoctor               OWNER to "USER";
+ALTER TABLE myhealth.medicalspecialty           OWNER to "USER";
+ALTER TABLE myhealth.patient                    OWNER to "USER";
+ALTER TABLE myhealth.specialistdoctor           OWNER to "USER";
+ALTER TABLE myhealth.visit                      OWNER to "USER";
+ALTER TABLE myhealth.question                   OWNER to "USER";
+ALTER TABLE myhealth.medicaltest                OWNER to "USER";
+
+-- Permisos para la máquina de PRE (usuario: usrmyhealth)
+GRANT ALL ON myhealth.administrator              to usrmyhealth;
+GRANT ALL ON myhealth.primaryhealthcarecenter    to usrmyhealth;
+GRANT ALL ON myhealth.familydoctor               to usrmyhealth;
+GRANT ALL ON myhealth.medicalspecialty           to usrmyhealth;
+GRANT ALL ON myhealth.patient                    to usrmyhealth;
+GRANT ALL ON myhealth.specialistdoctor           to usrmyhealth;
+GRANT ALL ON myhealth.visit                      to usrmyhealth;
+GRANT ALL ON myhealth.question                   to usrmyhealth;
+GRANT ALL ON myhealth.medicaltest                to usrmyhealth;
 
 END;
-$$
+$$
\ No newline at end of file
diff --git a/2.database/02. Datos_prueba.sql b/2.database/02.Datos_prueba.sql
similarity index 69%
rename from 2.database/02. Datos_prueba.sql
rename to 2.database/02.Datos_prueba.sql
index 6c63969..40580be 100644
--- a/2.database/02. Datos_prueba.sql	
+++ b/2.database/02.Datos_prueba.sql
@@ -1,92 +1,111 @@
---Inserta usuarios administradores (contraseña Hash MD5 'admin' para todos)
-insert into myhealth.administrator (email, password) values 
-('admin@example.com', '21232F297A57A5A743894A0E4A801FC3')
-,('marcos@example.com', '21232F297A57A5A743894A0E4A801FC3');
-
--- Insertar Algunos centros médicos
-INSERT INTO myhealth.primaryhealthcarecenter(name, location) VALUES
-('Centro Saude A Doblada',' Calle Rua Faisan S/N')
-,('Centro Saude Bembrive',' Carretera Bembrive 259')
-,('Centro Saude Bolivia',' Calle Pizarro 22')
-,('Centro Saude Casco Vello',' Plaza Constitucion 7')
-,('Centro Saude Coia',' Calle Ponteareas S/N')
-,('Centro Saude Colmeiro',' Calle Pintor Colmeiro 11')
-,('Centro Saude Coruxo',' Calle Rua Jose Rivas Carrasqueira S/N')
-,('Centro Saude Lavadores',' Travesia Barreiro 1 36')
-,('Centro Saude Lopez Mora',' Calle Lopez Mora 54')
-,('Centro Saude Matama',' Camino Camiño Babio-As Carneiras S/N')
-,('Centro Saude Nicolas Peña',' Camino Camiño Regueiro S/N')
-,('Centro Saude Rosalia De Castro-Beiramar',' Calle Rosalia De Castro 21')
-,('Centro Saude Rua Cuba',' Calle Cuba 10')
-,('Centro Saude San Paio De Navia',' Calle Poza Cabalo S/N')
-,('Centro Saude Sardoma',' Calle Rua Canteira De Balin 76')
-,('Centro Saude Teis',' Calle Angela Iglesias Rebollar S/N');
-
--- Inserta Especialidades médicas
-insert into MyHealth.MedicalSpecialty(name, description) values 
-('Alergologia','Especialidad médica de Alergologia')
-,('Cirugía cardiaca','Especialidad médica de Cirugía cardiaca')
-,('Cirugía general','Especialidad médica de Cirugía general')
-,('Cirugía plastica','Especialidad médica de Cirugía plastica')
-,('Cirugía de mama','Especialidad médica de Cirugía de mama')
-,('Cirugía maxilofacial','Especialidad médica de Cirugía maxilofacial')
-,('Cirugía vascular','Especialidad médica de Cirugía vascular')
-,('Dermatología','Especialidad médica de Dermatología')
-,('Endocrinología y nutrición','Especialidad médica de Endocrinología y nutrición')
-,('Gastroenterología- digestivo','Especialidad médica de Gastroenterología- digestivo')
-,('Neurocirugía','Especialidad médica de Neurocirugía')
-,('Oftalmología','Especialidad médica de Oftalmología')
-,('Otorrinolaringologia','Especialidad médica de Otorrinolaringologia')
-,('Oncología','Especialidad médica de Oncología')
-,('Pediatría','Especialidad médica de Pediatría');
-
--- Insertar médicos de familia
-INSERT INTO myhealth.familydoctor(professionalnumber, password, nif, surname, email, name, primaryhealthcarecenterid) VALUES 
-('PRO#100','912EC803B2CE49E4A541068D495AB570','95874388S','Moran Ortiz', 'Xian@example.ecom','Xian', 1)
-,('PRO#101','912EC803B2CE49E4A541068D495AB570','59546140Z','Zambrano Rivas', 'Belen@example.ecom','Belen', 2)
-,('PRO#102','912EC803B2CE49E4A541068D495AB570','16354100L','Cuevas Luque', 'Fernando@example.ecom','Fernando', 3)
-,('PRO#103','912EC803B2CE49E4A541068D495AB570','32662259M','Becerra Muñiz', 'Luis@example.ecom','Luis', 4)
-,('PRO#104','912EC803B2CE49E4A541068D495AB570','70600712G','Aznar Silva', 'Ana@example.ecom','Ana', 5)
-,('PRO#105','912EC803B2CE49E4A541068D495AB570','08003806J','Galvez Sancho', 'Alfonso@example.ecom','Alfonso', 6)
-,('PRO#106','912EC803B2CE49E4A541068D495AB570','19567288S','Criado Marti', 'Jordi@example.ecom','Jordi', 7)
-,('PRO#107','912EC803B2CE49E4A541068D495AB570','95413653Q','Estevez Mena', 'Barbara@example.ecom','Barbara', 8)
-,('PRO#108','912EC803B2CE49E4A541068D495AB570','90914444K','Godoy Alcaide', 'Amalia@example.ecom','Amalia', 9)
-,('PRO#109','912EC803B2CE49E4A541068D495AB570','05709869G','Lucas Wang', 'Carmelo@example.ecom','Carmelo', 10);
-
--- Insertar médicos especialistas
-INSERT INTO myhealth.specialistdoctor(professionalnumber, password, nif, surname, email, name, medicalspecialtyid) VALUES 
-('PRO#110','912EC803B2CE49E4A541068D495AB570','87719252N','Vazquez Cruz', 'Luciano@example.ecom','Luciano', 1)
-,('PRO#111','912EC803B2CE49E4A541068D495AB570','79412306E','Alcaide Mesa', 'Gregorio@example.ecom','Gregorio', 2)
-,('PRO#112','912EC803B2CE49E4A541068D495AB570','45727688P','Herranz Soria', 'Candida@example.ecom','Candida', 3)
-,('PRO#113','912EC803B2CE49E4A541068D495AB570','65061962E','Galvez Vives', 'Nora@example.ecom','Nora', 4)
-,('PRO#114','912EC803B2CE49E4A541068D495AB570','07359870P','Rojas Alonso', 'Anton@example.ecom','Anton', 5)
-,('PRO#115','912EC803B2CE49E4A541068D495AB570','14117403A','Lorente Carmona', 'Sheila@example.ecom','Sheila', 6)
-,('PRO#116','912EC803B2CE49E4A541068D495AB570','79864477J','Gonzalo Bonet', 'Nicolas@example.ecom','Nicolas', 7)
-,('PRO#117','912EC803B2CE49E4A541068D495AB570','22761129F','Bonet Ariza', 'Aroa@example.ecom','Aroa', 8)
-,('PRO#118','912EC803B2CE49E4A541068D495AB570','99693813Z','Soria Singh', 'Cristian@example.ecom','Cristian', 9)
-,('PRO#119','912EC803B2CE49E4A541068D495AB570','04431824T','Requena Calderon', 'Ferran@example.ecom','Ferran', 10)
-,('PRO#120','912EC803B2CE49E4A541068D495AB570','27476123R','Angulo Zamora', 'Ana@example.ecom','Ana', 11);
- 
---Insertar Pacientes
-INSERT INTO myhealth.patient(personalidentificationcode, password, nif, surname, email, name, familydoctorid) VALUES 
-('PAT#100','912EC803B2CE49E4A541068D495AB570','97758900E','Singh Vila', 'Soledad@example.ecom','Soledad', 1)
-,('PAT#101','912EC803B2CE49E4A541068D495AB570','Z9518183Y','Jimenez Merino', 'Ainhoa@example.ecom','Ainhoa', 2)
-,('PAT#102','912EC803B2CE49E4A541068D495AB570','97758900E','Jesus Chen Barba', 'Abel@example.ecom','Abel', 3)
-,('PAT#103','912EC803B2CE49E4A541068D495AB570','95014341F','Lorenzo Tapia Navas', 'Francisco@example.ecom','Francisco', 4)
-,('PAT#104','912EC803B2CE49E4A541068D495AB570','17873499S','Gimenez Gutierrez', 'Teodora@example.ecom','Teodora', 5)
-,('PAT#105','912EC803B2CE49E4A541068D495AB570','07320674G','Escobar Marquez', 'Jorge@example.ecom','Jorge', 6)
-,('PAT#106','912EC803B2CE49E4A541068D495AB570','63888801E','Marin Reina', 'Marti@example.ecom','Marti', 7)
-,('PAT#107','912EC803B2CE49E4A541068D495AB570','36676167E','Bosch Zapata', 'Abril@example.ecom','Abril', 8)
-,('PAT#108','912EC803B2CE49E4A541068D495AB570','73569670F','Bosch Zapata', 'Esperanza@example.ecom','Esperanza', 9)
-,('PAT#109','912EC803B2CE49E4A541068D495AB570','53986482P','Carretero Ayala', 'Eduardo@example.ecom','Eduardo', 10);
-
-
-INSERT INTO myhealth.question(title, message, status, response, patientid, familydoctorid) VALUES
-    ('Question 1','Pues eso pringao, cómo va la cosa?',0,null,1,1),
-    ('Question 2','Pues eso pringao, cómo va la cosa?',0,null,1,2),
-    ('Question 2','Pues eso pringao, cómo va la cosa?',0,null,2,1);
-
-INSERT INTO myhealth.medicaltest(date, "time", observations, highresimage,"type",patientid, specialistdoctorid) VALUES
-    ('2019/12/15',now(),'',null,0,1,1),
-    ('2019/12/15',now(),'',null,0,1,2),
-    ('2019/12/15',now(),'',null,0,2,1);
\ No newline at end of file
+--Inserta usuarios administradores (contraseña Hash MD5 'admin' para todos)
+insert into myhealth.administrator (email, password) values 
+('admin@example.com', '21232F297A57A5A743894A0E4A801FC3')
+,('marcos@example.com', '21232F297A57A5A743894A0E4A801FC3');
+
+-- Insertar Algunos centros médicos
+INSERT INTO myhealth.primaryhealthcarecenter(name, location) VALUES
+('Centro Saude A Doblada',' Calle Rua Faisan S/N')
+,('Centro Saude Bembrive',' Carretera Bembrive 259')
+,('Centro Saude Bolivia',' Calle Pizarro 22')
+,('Centro Saude Casco Vello',' Plaza Constitucion 7')
+,('Centro Saude Coia',' Calle Ponteareas S/N')
+,('Centro Saude Colmeiro',' Calle Pintor Colmeiro 11')
+,('Centro Saude Coruxo',' Calle Rua Jose Rivas Carrasqueira S/N')
+,('Centro Saude Lavadores',' Travesia Barreiro 1 36')
+,('Centro Saude Lopez Mora',' Calle Lopez Mora 54')
+,('Centro Saude Matama',' Camino Camiño Babio-As Carneiras S/N')
+,('Centro Saude Nicolas Peña',' Camino Camiño Regueiro S/N')
+,('Centro Saude Rosalia De Castro-Beiramar',' Calle Rosalia De Castro 21')
+,('Centro Saude Rua Cuba',' Calle Cuba 10')
+,('Centro Saude San Paio De Navia',' Calle Poza Cabalo S/N')
+,('Centro Saude Sardoma',' Calle Rua Canteira De Balin 76')
+,('Centro Saude Teis',' Calle Angela Iglesias Rebollar S/N');
+
+-- Inserta Especialidades médicas
+insert into MyHealth.MedicalSpecialty(name, description) values 
+('Alergologia','Especialidad médica de Alergologia')
+,('Cirugía cardiaca','Especialidad médica de Cirugía cardiaca')
+,('Cirugía general','Especialidad médica de Cirugía general')
+,('Cirugía plastica','Especialidad médica de Cirugía plastica')
+,('Cirugía de mama','Especialidad médica de Cirugía de mama')
+,('Cirugía maxilofacial','Especialidad médica de Cirugía maxilofacial')
+,('Cirugía vascular','Especialidad médica de Cirugía vascular')
+,('Dermatología','Especialidad médica de Dermatología')
+,('Endocrinología y nutrición','Especialidad médica de Endocrinología y nutrición')
+,('Gastroenterología- digestivo','Especialidad médica de Gastroenterología- digestivo')
+,('Neurocirugía','Especialidad médica de Neurocirugía')
+,('Oftalmología','Especialidad médica de Oftalmología')
+,('Otorrinolaringologia','Especialidad médica de Otorrinolaringologia')
+,('Oncología','Especialidad médica de Oncología')
+,('Pediatría','Especialidad médica de Pediatría');
+
+-- Insertar médicos de familia
+INSERT INTO myhealth.familydoctor(professionalnumber, password, nif, surname, email, name, primaryhealthcarecenterid) VALUES 
+('PRO#100','912EC803B2CE49E4A541068D495AB570','95874388S','Moran Ortiz', 'Xian@example.ecom','Xian', 1)
+,('PRO#101','912EC803B2CE49E4A541068D495AB570','59546140Z','Zambrano Rivas', 'Belen@example.ecom','Belen', 2)
+,('PRO#102','912EC803B2CE49E4A541068D495AB570','16354100L','Cuevas Luque', 'Fernando@example.ecom','Fernando', 3)
+,('PRO#103','912EC803B2CE49E4A541068D495AB570','32662259M','Becerra Muñiz', 'Luis@example.ecom','Luis', 4)
+,('PRO#104','912EC803B2CE49E4A541068D495AB570','70600712G','Aznar Silva', 'Ana@example.ecom','Ana', 5)
+,('PRO#105','912EC803B2CE49E4A541068D495AB570','08003806J','Galvez Sancho', 'Alfonso@example.ecom','Alfonso', 6)
+,('PRO#106','912EC803B2CE49E4A541068D495AB570','19567288S','Criado Marti', 'Jordi@example.ecom','Jordi', 7)
+,('PRO#107','912EC803B2CE49E4A541068D495AB570','95413653Q','Estevez Mena', 'Barbara@example.ecom','Barbara', 8)
+,('PRO#108','912EC803B2CE49E4A541068D495AB570','90914444K','Godoy Alcaide', 'Amalia@example.ecom','Amalia', 9)
+,('PRO#109','912EC803B2CE49E4A541068D495AB570','05709869G','Lucas Wang', 'Carmelo@example.ecom','Carmelo', 10);
+
+-- Insertar médicos especialistas
+INSERT INTO myhealth.specialistdoctor(professionalnumber, password, nif, surname, email, name, medicalspecialtyid) VALUES 
+('PRO#110','912EC803B2CE49E4A541068D495AB570','87719252N','Vazquez Cruz', 'Luciano@example.ecom','Luciano', 1)
+,('PRO#111','912EC803B2CE49E4A541068D495AB570','79412306E','Alcaide Mesa', 'Gregorio@example.ecom','Gregorio', 2)
+,('PRO#112','912EC803B2CE49E4A541068D495AB570','45727688P','Herranz Soria', 'Candida@example.ecom','Candida', 3)
+,('PRO#113','912EC803B2CE49E4A541068D495AB570','65061962E','Galvez Vives', 'Nora@example.ecom','Nora', 4)
+,('PRO#114','912EC803B2CE49E4A541068D495AB570','07359870P','Rojas Alonso', 'Anton@example.ecom','Anton', 5)
+,('PRO#115','912EC803B2CE49E4A541068D495AB570','14117403A','Lorente Carmona', 'Sheila@example.ecom','Sheila', 6)
+,('PRO#116','912EC803B2CE49E4A541068D495AB570','79864477J','Gonzalo Bonet', 'Nicolas@example.ecom','Nicolas', 7)
+,('PRO#117','912EC803B2CE49E4A541068D495AB570','22761129F','Bonet Ariza', 'Aroa@example.ecom','Aroa', 8)
+,('PRO#118','912EC803B2CE49E4A541068D495AB570','99693813Z','Soria Singh', 'Cristian@example.ecom','Cristian', 9)
+,('PRO#119','912EC803B2CE49E4A541068D495AB570','04431824T','Requena Calderon', 'Ferran@example.ecom','Ferran', 10)
+,('PRO#120','912EC803B2CE49E4A541068D495AB570','27476123R','Angulo Zamora', 'Ana@example.ecom','Ana', 11);
+ 
+--Insertar Pacientes
+INSERT INTO myhealth.patient(personalidentificationcode, password, nif, surname, email, name, familydoctorid) VALUES 
+('PAT#100','912EC803B2CE49E4A541068D495AB570','97758900E','Singh Vila', 'Soledad@example.ecom','Soledad', 1)
+,('PAT#101','912EC803B2CE49E4A541068D495AB570','Z9518183Y','Jimenez Merino', 'Ainhoa@example.ecom','Ainhoa', 2)
+,('PAT#102','912EC803B2CE49E4A541068D495AB570','49426296D','Jesus Chen Barba', 'Abel@example.ecom','Abel', 3)
+,('PAT#103','912EC803B2CE49E4A541068D495AB570','95014341F','Lorenzo Tapia Navas', 'Francisco@example.ecom','Francisco', 4)
+,('PAT#104','912EC803B2CE49E4A541068D495AB570','17873499S','Gimenez Gutierrez', 'Teodora@example.ecom','Teodora', 5)
+,('PAT#105','912EC803B2CE49E4A541068D495AB570','07320674G','Escobar Marquez', 'Jorge@example.ecom','Jorge', 6)
+,('PAT#106','912EC803B2CE49E4A541068D495AB570','63888801E','Marin Reina', 'Marti@example.ecom','Marti', 7)
+,('PAT#107','912EC803B2CE49E4A541068D495AB570','36676167E','Bosch Zapata', 'Abril@example.ecom','Abril', 8)
+,('PAT#108','912EC803B2CE49E4A541068D495AB570','73569670F','Bosch Zapata', 'Esperanza@example.ecom','Esperanza', 9)
+,('PAT#109','912EC803B2CE49E4A541068D495AB570','53986482P','Carretero Ayala', 'Eduardo@example.ecom','Eduardo', 10);
+
+INSERT INTO myhealth.question(title, message, status, response, patientid, familydoctorid) VALUES 
+('titulo de la pregunta número 1', 'Doctor, tengo dolor en la articulación numero 1', 'PENDING', null,  1,  1)
+,('titulo de la pregunta número 2', 'Doctor, tengo dolor en la articulación numero 2', 'PENDING', null,  2,  1)
+,('titulo de la pregunta número 3', 'Doctor, tengo dolor en la articulación numero 3', 'PENDING', null,  3,  1)
+,('titulo de la pregunta número 4', 'Doctor, tengo dolor en la articulación numero 4', 'PENDING', null,  4,  1)
+,('titulo de la pregunta número 5', 'Doctor, tengo dolor en la articulación numero 5', 'PENDING', null,  5,  1)
+,('titulo de la pregunta número 6', 'Doctor, tengo dolor en la articulación numero 6', 'PENDING', null,  6,  1)
+,('titulo de la pregunta número 7', 'Doctor, tengo dolor en la articulación numero 7', 'PENDING', null,  7,  1)
+,('titulo de la pregunta número 8', 'Doctor, tengo dolor en la articulación numero 8', 'PENDING', null,  8,  1)
+,('titulo de la pregunta número 9', 'Doctor, tengo dolor en la articulación numero 9', 'PENDING', null,  9,  1)
+,('titulo de la pregunta número 10', 'Doctor, tengo dolor en la articulación numero 10', 'PENDING', null,  10,  1)
+,('titulo de la pregunta número 11', 'Doctor, tengo dolor en la articulación numero 11', 'PENDING', null,  1,  1)
+,('titulo de la pregunta número 12', 'Doctor, tengo dolor en la articulación numero 12', 'PENDING', null,  2,  1)
+,('titulo de la pregunta número 13', 'Doctor, tengo dolor en la articulación numero 13', 'PENDING', null,  3,  1)
+,('titulo de la pregunta número 14', 'Doctor, tengo dolor en la articulación numero 14', 'PENDING', null,  4,  1)
+,('titulo de la pregunta número 15', 'Doctor, tengo dolor en la articulación numero 15', 'PENDING', null,  5,  1)
+,('titulo de la pregunta número 16', 'Doctor, tengo dolor en la articulación numero 16', 'PENDING', null,  6,  1)
+,('titulo de la pregunta número 17', 'Doctor, tengo dolor en la articulación numero 17', 'PENDING', null,  7,  1)
+,('titulo de la pregunta número 18', 'Doctor, tengo dolor en la articulación numero 18', 'PENDING', null,  8,  1)
+,('titulo de la pregunta número 19', 'Doctor, tengo dolor en la articulación numero 19', 'PENDING', null,  9,  1)
+,('titulo de la pregunta número 20', 'Doctor, tengo dolor en la articulación numero 20', 'PENDING', null,  10,  1)
+,('titulo de la pregunta número 21', 'Doctor, tengo dolor en la articulación numero 21', 'PENDING', null,  8,  1)
+,('titulo de la pregunta número 22', 'Doctor, tengo dolor en la articulación numero 22', 'PENDING', null,  9,  1)
+,('titulo de la pregunta número 23', 'Doctor, tengo dolor en la articulación numero 23', 'PENDING', null,  10,  1);
+
+INSERT INTO myhealth.medicaltest(date, "time", observations, highresimage,"type",patientid, specialistdoctorid) VALUES
+    ('2019/12/15',now(),'',null,0,1,1),
+    ('2019/12/15',now(),'',null,0,1,2),
+    ('2019/12/15',now(),'',null,0,2,1);
diff --git a/3.docs/.project b/3.docs/.project
new file mode 100644
index 0000000..0d9876f
--- /dev/null
+++ b/3.docs/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>3.docs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/3.docs/PDS_Practica_4_Grupo2.docx b/3.docs/PDS_Practica_4_Grupo2.docx
new file mode 100644
index 0000000..9b5b7e1
Binary files /dev/null and b/3.docs/PDS_Practica_4_Grupo2.docx differ
diff --git a/3.docs/PDS_Practica_4_Grupo_2_Informe de testing.docx b/3.docs/PDS_Practica_4_Grupo_2_Informe de testing.docx
new file mode 100644
index 0000000..11b70aa
Binary files /dev/null and b/3.docs/PDS_Practica_4_Grupo_2_Informe de testing.docx differ
diff --git a/4.config/createApplicationUser.sh b/4.config/createApplicationUser.sh
new file mode 100755
index 0000000..8712bdc
--- /dev/null
+++ b/4.config/createApplicationUser.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/expect -f
+#
+# This Expect script was generated by autoexpect on Wed Dec 18 17:32:33 2019
+# Expect and autoexpect were both written by Don Libes, NIST.
+#
+# Note that autoexpect does not guarantee a working script.  It
+# necessarily has to guess about certain things.  Two reasons a script
+# might fail are:
+#
+# 1) timing - A surprising number of programs (rn, ksh, zsh, telnet,
+# etc.) and devices discard or ignore keystrokes that arrive "too
+# quickly" after prompts.  If you find your new script hanging up at
+# one spot, try adding a short sleep just before the previous send.
+# Setting "force_conservative" to 1 (see below) makes Expect do this
+# automatically - pausing briefly before sending each character.  This
+# pacifies every program I know of.  The -c flag makes the script do
+# this in the first place.  The -C flag allows you to define a
+# character to toggle this mode off and on.
+
+set force_conservative 0  ;# set to 1 to force conservative mode even if
+			  ;# script wasn't run conservatively originally
+if {$force_conservative} {
+	set send_slow {1 .1}
+	proc send {ignore arg} {
+		sleep .1
+		exp_send -s -- $arg
+	}
+}
+
+#
+# 2) differing output - Some programs produce different output each time
+# they run.  The "date" command is an obvious example.  Another is
+# ftp, if it produces throughput statistics at the end of a file
+# transfer.  If this causes a problem, delete these patterns or replace
+# them with wildcards.  An alternative is to use the -p flag (for
+# "prompt") which makes Expect only look for the last line of output
+# (i.e., the prompt).  The -P flag allows you to define a character to
+# toggle this mode off and on.
+#
+# Read the man page for more info.
+#
+# -Don
+
+
+set timeout -1
+spawn ./add-user.sh
+match_max 100000
+expect -exact "\r
+What type of user do you wish to add? \r
+ a) Management User (mgmt-users.properties) \r
+ b) Application User (application-users.properties)\r
+(a): "
+send -- "b\r"
+expect -exact "b\r
+\r
+Enter the details of the new user to add.\r
+Using realm 'ApplicationRealm' as discovered from the existing property files.\r
+Username : "
+send -- "USER\r"
+expect -exact "USER\r
+Password recommendations are listed below. To modify these restrictions edit the add-user.properties configuration file.\r
+ - The password should be different from the username\r
+ - The password should not be one of the following restricted values {root, admin, administrator}\r
+ - The password should contain at least 8 characters, 1 alphabetic character(s), 1 digit(s), 1 non-alphanumeric symbol(s)\r
+Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+WFLYDM0101: Password should have at least 1 digit.\r
+Are you sure you want to use the password entered yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Re-enter Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+What groups do you want this user to belong to? (Please enter a comma separated list, or leave blank for none)\[  \]: "
+send -- " User,Trainer,Administrator"
+expect -exact " User,Trainer,Administrator"
+send -- "\r"
+expect -exact "\r
+About to add user 'USER' for realm 'ApplicationRealm'\r
+Is this correct yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Added user 'USER' to file '/opt/jboss/wildfly/standalone/configuration/application-users.properties'\r
+Added user 'USER' to file '/opt/jboss/wildfly/domain/configuration/application-users.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/standalone/configuration/application-roles.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/domain/configuration/application-roles.properties'\r
+Is this new user going to be used for one AS process to connect to another AS process? \r
+e.g. for a slave host controller connecting to the master or for a Remoting connection for server to server EJB calls.\r
+yes/no? "
+send -- "Y\r"
+expect eof
\ No newline at end of file
diff --git a/4.config/createManagementUser.sh b/4.config/createManagementUser.sh
new file mode 100755
index 0000000..6003783
--- /dev/null
+++ b/4.config/createManagementUser.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/expect -f
+#
+# This Expect script was generated by autoexpect on Wed Dec 18 17:37:57 2019
+# Expect and autoexpect were both written by Don Libes, NIST.
+#
+# Note that autoexpect does not guarantee a working script.  It
+# necessarily has to guess about certain things.  Two reasons a script
+# might fail are:
+#
+# 1) timing - A surprising number of programs (rn, ksh, zsh, telnet,
+# etc.) and devices discard or ignore keystrokes that arrive "too
+# quickly" after prompts.  If you find your new script hanging up at
+# one spot, try adding a short sleep just before the previous send.
+# Setting "force_conservative" to 1 (see below) makes Expect do this
+# automatically - pausing briefly before sending each character.  This
+# pacifies every program I know of.  The -c flag makes the script do
+# this in the first place.  The -C flag allows you to define a
+# character to toggle this mode off and on.
+
+set force_conservative 0  ;# set to 1 to force conservative mode even if
+			  ;# script wasn't run conservatively originally
+if {$force_conservative} {
+	set send_slow {1 .1}
+	proc send {ignore arg} {
+		sleep .1
+		exp_send -s -- $arg
+	}
+}
+
+#
+# 2) differing output - Some programs produce different output each time
+# they run.  The "date" command is an obvious example.  Another is
+# ftp, if it produces throughput statistics at the end of a file
+# transfer.  If this causes a problem, delete these patterns or replace
+# them with wildcards.  An alternative is to use the -p flag (for
+# "prompt") which makes Expect only look for the last line of output
+# (i.e., the prompt).  The -P flag allows you to define a character to
+# toggle this mode off and on.
+#
+# Read the man page for more info.
+#
+# -Don
+
+
+set timeout -1
+spawn ./add-user.sh
+match_max 100000
+expect -exact "\r
+What type of user do you wish to add? \r
+ a) Management User (mgmt-users.properties) \r
+ b) Application User (application-users.properties)\r
+(a): "
+send -- "A\r"
+expect -exact "A\r
+\r
+Enter the details of the new user to add.\r
+Using realm 'ManagementRealm' as discovered from the existing property files.\r
+Username : "
+send -- "USER\r"
+expect -exact "USER\r
+Password recommendations are listed below. To modify these restrictions edit the add-user.properties configuration file.\r
+ - The password should be different from the username\r
+ - The password should not be one of the following restricted values {root, admin, administrator}\r
+ - The password should contain at least 8 characters, 1 alphabetic character(s), 1 digit(s), 1 non-alphanumeric symbol(s)\r
+Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+WFLYDM0101: Password should have at least 1 digit.\r
+Are you sure you want to use the password entered yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Re-enter Password : "
+send -- "PASSWORD\r"
+expect -exact "\r
+What groups do you want this user to belong to? (Please enter a comma separated list, or leave blank for none)\[  \]: "
+send -- " User,Trainer,Administrator"
+expect -exact " User,Trainer,Administrator"
+send -- "\r"
+expect -exact "\r
+About to add user 'USER' for realm 'ManagementRealm'\r
+Is this correct yes/no? "
+send -- "Y\r"
+expect -exact "Y\r
+Added user 'USER' to file '/opt/jboss/wildfly/standalone/configuration/mgmt-users.properties'\r
+Added user 'USER' to file '/opt/jboss/wildfly/domain/configuration/mgmt-users.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/standalone/configuration/mgmt-groups.properties'\r
+Added user 'USER' with groups  User,Trainer,Administrator to file '/opt/jboss/wildfly/domain/configuration/mgmt-groups.properties'\r
+Is this new user going to be used for one AS process to connect to another AS process? \r
+e.g. for a slave host controller connecting to the master or for a Remoting connection for server to server EJB calls.\r
+yes/no? "
+send -- "Y\r"
+expect eof
\ No newline at end of file
diff --git a/4.config/module.xml b/4.config/module.xml
new file mode 100644
index 0000000..eae6534
--- /dev/null
+++ b/4.config/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.0" name="org.postgresql">
+<resources>
+<resource-root path="postgresql-9.4.1209.jar"/>
+</resources>
+<dependencies>
+<module name="javax.api"/>
+<module name="javax.transaction.api"/>
+</dependencies>
+</module>
\ No newline at end of file
diff --git a/4.config/postgresql-9.4.1209.jar b/4.config/postgresql-9.4.1209.jar
new file mode 100755
index 0000000..d0f4923
Binary files /dev/null and b/4.config/postgresql-9.4.1209.jar differ
diff --git a/4.config/standalone.xml b/4.config/standalone.xml
new file mode 100644
index 0000000..ee2fbea
--- /dev/null
+++ b/4.config/standalone.xml
@@ -0,0 +1,524 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:8.0">
+    <extensions>
+        <extension module="org.jboss.as.clustering.infinispan"/>
+        <extension module="org.jboss.as.connector"/>
+        <extension module="org.jboss.as.deployment-scanner"/>
+        <extension module="org.jboss.as.ee"/>
+        <extension module="org.jboss.as.ejb3"/>
+        <extension module="org.jboss.as.jaxrs"/>
+        <extension module="org.jboss.as.jdr"/>
+        <extension module="org.jboss.as.jmx"/>
+        <extension module="org.jboss.as.jpa"/>
+        <extension module="org.jboss.as.jsf"/>
+        <extension module="org.jboss.as.logging"/>
+        <extension module="org.jboss.as.mail"/>
+        <extension module="org.jboss.as.naming"/>
+        <extension module="org.jboss.as.pojo"/>
+        <extension module="org.jboss.as.remoting"/>
+        <extension module="org.jboss.as.sar"/>
+        <extension module="org.jboss.as.security"/>
+        <extension module="org.jboss.as.transactions"/>
+        <extension module="org.jboss.as.webservices"/>
+        <extension module="org.jboss.as.weld"/>
+        <extension module="org.wildfly.extension.batch.jberet"/>
+        <extension module="org.wildfly.extension.bean-validation"/>
+        <extension module="org.wildfly.extension.core-management"/>
+        <extension module="org.wildfly.extension.discovery"/>
+        <extension module="org.wildfly.extension.ee-security"/>
+        <extension module="org.wildfly.extension.elytron"/>
+        <extension module="org.wildfly.extension.io"/>
+        <extension module="org.wildfly.extension.microprofile.config-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.health-smallrye"/>
+        <extension module="org.wildfly.extension.microprofile.opentracing-smallrye"/>
+        <extension module="org.wildfly.extension.request-controller"/>
+        <extension module="org.wildfly.extension.security.manager"/>
+        <extension module="org.wildfly.extension.undertow"/>
+    </extensions>
+    <management>
+        <security-realms>
+            <security-realm name="ManagementRealm">
+                <authentication>
+                    <local default-user="$local" skip-group-loading="true"/>
+                    <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization map-groups-to-roles="false">
+                    <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+            <security-realm name="ApplicationRealm">
+                <server-identities>
+                    <ssl>
+                        <keystore path="application.keystore" relative-to="jboss.server.config.dir" keystore-password="password" alias="server" key-password="password" generate-self-signed-certificate-host="localhost"/>
+                    </ssl>
+                </server-identities>
+                <authentication>
+                    <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
+                    <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+                </authentication>
+                <authorization>
+                    <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </authorization>
+            </security-realm>
+        </security-realms>
+        <audit-log>
+            <formatters>
+                <json-formatter name="json-formatter"/>
+            </formatters>
+            <handlers>
+                <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
+            </handlers>
+            <logger log-boot="true" log-read-only="false" enabled="false">
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
+            </logger>
+        </audit-log>
+        <management-interfaces>
+            <http-interface security-realm="ManagementRealm">
+                <http-upgrade enabled="true"/>
+                <socket-binding http="management-http"/>
+            </http-interface>
+        </management-interfaces>
+        <access-control provider="simple">
+            <role-mapping>
+                <role name="SuperUser">
+                    <include>
+                        <user name="$local"/>
+                    </include>
+                </role>
+            </role-mapping>
+        </access-control>
+    </management>
+    <profile>
+        <subsystem xmlns="urn:jboss:domain:logging:6.0">
+            <console-handler name="CONSOLE">
+                <level name="INFO"/>
+                <formatter>
+                    <named-formatter name="COLOR-PATTERN"/>
+                </formatter>
+            </console-handler>
+            <periodic-rotating-file-handler name="FILE" autoflush="true">
+                <formatter>
+                    <named-formatter name="PATTERN"/>
+                </formatter>
+                <file relative-to="jboss.server.log.dir" path="server.log"/>
+                <suffix value=".yyyy-MM-dd"/>
+                <append value="true"/>
+            </periodic-rotating-file-handler>
+            <logger category="com.arjuna">
+                <level name="WARN"/>
+            </logger>
+            <logger category="org.jboss.as.config">
+                <level name="DEBUG"/>
+            </logger>
+            <logger category="sun.rmi">
+                <level name="WARN"/>
+            </logger>
+            <root-logger>
+                <level name="INFO"/>
+                <handlers>
+                    <handler name="CONSOLE"/>
+                    <handler name="FILE"/>
+                </handlers>
+            </root-logger>
+            <formatter name="PATTERN">
+                <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+            <formatter name="COLOR-PATTERN">
+                <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/>
+            </formatter>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:batch-jberet:2.0">
+            <default-job-repository name="in-memory"/>
+            <default-thread-pool name="batch"/>
+            <job-repository name="in-memory">
+                <in-memory/>
+            </job-repository>
+            <thread-pool name="batch">
+                <max-threads count="10"/>
+                <keepalive-time time="30" unit="seconds"/>
+            </thread-pool>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:core-management:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:datasources:5.0">
+            <datasources>
+                <datasource jta="false" jndi-name="java:jboss/postgresDS" pool-name="postgresDS" enabled="true" use-java-context="true" use-ccm="false">
+                    <connection-url>jdbc:postgresql://postgres:5432/myhealth</connection-url>
+                    <driver-class>org.postgresql.Driver</driver-class>
+                    <driver>postgresql</driver>
+                    <security>
+                        <user-name>USER</user-name>
+                        <password>PASSWORD</password>
+                    </security>
+                </datasource>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
+                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
+                    <driver>h2</driver>
+                    <security>
+                        <user-name>sa</user-name>
+                        <password>sa</password>
+                    </security>
+                </datasource>
+                <drivers>
+                    <driver name="postgresql" module="org.postgresql">
+                        <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
+                    </driver>
+                    <driver name="h2" module="com.h2database.h2">
+                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+                    </driver>
+                </drivers>
+            </datasources>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+            <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:discovery:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:ee:4.0">
+            <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+            <concurrent>
+                <context-services>
+                    <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+                </context-services>
+                <managed-thread-factories>
+                    <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+                </managed-thread-factories>
+                <managed-executor-services>
+                    <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/>
+                </managed-executor-services>
+                <managed-scheduled-executor-services>
+                    <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/>
+                </managed-scheduled-executor-services>
+            </concurrent>
+            <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:ee-security:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:ejb3:5.0">
+            <session-bean>
+                <stateless>
+                    <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/>
+                </stateless>
+                <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
+                <singleton default-access-timeout="5000"/>
+            </session-bean>
+            <pools>
+                <bean-instance-pools>
+                    <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                    <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+                </bean-instance-pools>
+            </pools>
+            <caches>
+                <cache name="simple"/>
+                <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
+            </caches>
+            <passivation-stores>
+                <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
+            </passivation-stores>
+            <async thread-pool-name="default"/>
+            <timer-service thread-pool-name="default" default-data-store="default-file-store">
+                <data-stores>
+                    <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+                </data-stores>
+            </timer-service>
+            <remote connector-ref="http-remoting-connector" thread-pool-name="default">
+                <channel-creation-options>
+                    <option name="READ_TIMEOUT" value="${prop.remoting-connector.read.timeout:20}" type="xnio"/>
+                    <option name="MAX_OUTBOUND_MESSAGES" value="1234" type="remoting"/>
+                </channel-creation-options>
+            </remote>
+            <thread-pools>
+                <thread-pool name="default">
+                    <max-threads count="10"/>
+                    <keepalive-time time="100" unit="milliseconds"/>
+                </thread-pool>
+            </thread-pools>
+            <default-security-domain value="other"/>
+            <default-missing-method-permissions-deny-access value="true"/>
+            <log-system-exceptions value="true"/>
+        </subsystem>
+        <subsystem xmlns="urn:wildfly:elytron:4.0" final-providers="combined-providers" disallowed-providers="OracleUcrypto">
+            <providers>
+                <aggregate-providers name="combined-providers">
+                    <providers name="elytron"/>
+                    <providers name="openssl"/>
+                </aggregate-providers>
+                <provider-loader name="elytron" module="org.wildfly.security.elytron"/>
+                <provider-loader name="openssl" module="org.wildfly.openssl"/>
+            </providers>
+            <audit-logging>
+                <file-audit-log name="local-audit" path="audit.log" relative-to="jboss.server.log.dir" format="JSON"/>
+            </audit-logging>
+            <security-domains>
+                <security-domain name="ApplicationDomain" default-realm="ApplicationRealm" permission-mapper="default-permission-mapper">
+                    <realm name="ApplicationRealm" role-decoder="groups-to-roles"/>
+                    <realm name="local"/>
+                </security-domain>
+                <security-domain name="ManagementDomain" default-realm="ManagementRealm" permission-mapper="default-permission-mapper">
+                    <realm name="ManagementRealm" role-decoder="groups-to-roles"/>
+                    <realm name="local" role-mapper="super-user-mapper"/>
+                </security-domain>
+            </security-domains>
+            <security-realms>
+                <identity-realm name="local" identity="$local"/>
+                <properties-realm name="ApplicationRealm">
+                    <users-properties path="application-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ApplicationRealm"/>
+                    <groups-properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+                </properties-realm>
+                <properties-realm name="ManagementRealm">
+                    <users-properties path="mgmt-users.properties" relative-to="jboss.server.config.dir" digest-realm-name="ManagementRealm"/>
+                    <groups-properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+                </properties-realm>
+            </security-realms>
+            <mappers>
+                <simple-permission-mapper name="default-permission-mapper" mapping-mode="first">
+                    <permission-mapping>
+                        <principal name="anonymous"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                    <permission-mapping match-all="true">
+                        <permission-set name="login-permission"/>
+                        <permission-set name="default-permissions"/>
+                    </permission-mapping>
+                </simple-permission-mapper>
+                <constant-realm-mapper name="local" realm-name="local"/>
+                <simple-role-decoder name="groups-to-roles" attribute="groups"/>
+                <constant-role-mapper name="super-user-mapper">
+                    <role name="SuperUser"/>
+                </constant-role-mapper>
+            </mappers>
+            <permission-sets>
+                <permission-set name="login-permission">
+                    <permission class-name="org.wildfly.security.auth.permission.LoginPermission"/>
+                </permission-set>
+                <permission-set name="default-permissions">
+                    <permission class-name="org.wildfly.extension.batch.jberet.deployment.BatchPermission" module="org.wildfly.extension.batch.jberet" target-name="*"/>
+                    <permission class-name="org.wildfly.transaction.client.RemoteTransactionPermission" module="org.wildfly.transaction.client"/>
+                    <permission class-name="org.jboss.ejb.client.RemoteEJBPermission" module="org.jboss.ejb-client"/>
+                </permission-set>
+            </permission-sets>
+            <http>
+                <http-authentication-factory name="management-http-authentication" security-domain="ManagementDomain" http-server-mechanism-factory="global">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="DIGEST">
+                            <mechanism-realm realm-name="ManagementRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </http-authentication-factory>
+                <provider-http-server-mechanism-factory name="global"/>
+            </http>
+            <sasl>
+                <sasl-authentication-factory name="application-sasl-authentication" sasl-server-factory="configured" security-domain="ApplicationDomain">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                        <mechanism mechanism-name="DIGEST-MD5">
+                            <mechanism-realm realm-name="ApplicationRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </sasl-authentication-factory>
+                <sasl-authentication-factory name="management-sasl-authentication" sasl-server-factory="configured" security-domain="ManagementDomain">
+                    <mechanism-configuration>
+                        <mechanism mechanism-name="JBOSS-LOCAL-USER" realm-mapper="local"/>
+                        <mechanism mechanism-name="DIGEST-MD5">
+                            <mechanism-realm realm-name="ManagementRealm"/>
+                        </mechanism>
+                    </mechanism-configuration>
+                </sasl-authentication-factory>
+                <configurable-sasl-server-factory name="configured" sasl-server-factory="elytron">
+                    <properties>
+                        <property name="wildfly.sasl.local-user.default-user" value="$local"/>
+                    </properties>
+                </configurable-sasl-server-factory>
+                <mechanism-provider-filtering-sasl-server-factory name="elytron" sasl-server-factory="global">
+                    <filters>
+                        <filter provider-name="WildFlyElytron"/>
+                    </filters>
+                </mechanism-provider-filtering-sasl-server-factory>
+                <provider-sasl-server-factory name="global"/>
+            </sasl>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:infinispan:7.0">
+            <cache-container name="server" default-cache="default" module="org.wildfly.clustering.server">
+                <local-cache name="default">
+                    <transaction mode="BATCH"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
+                <local-cache name="passivation">
+                    <locking isolation="REPEATABLE_READ"/>
+                    <transaction mode="BATCH"/>
+                    <file-store passivation="true" purge="false"/>
+                </local-cache>
+            </cache-container>
+            <cache-container name="hibernate" module="org.infinispan.hibernate-cache">
+                <local-cache name="entity">
+                    <transaction mode="NON_XA"/>
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="local-query">
+                    <object-memory size="10000"/>
+                    <expiration max-idle="100000"/>
+                </local-cache>
+                <local-cache name="timestamps"/>
+            </cache-container>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:io:3.0">
+            <worker name="default"/>
+            <buffer-pool name="default"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jca:5.0">
+            <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+            <bean-validation enabled="true"/>
+            <default-workmanager>
+                <short-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </short-running-threads>
+                <long-running-threads>
+                    <core-threads count="50"/>
+                    <queue-length count="50"/>
+                    <max-threads count="50"/>
+                    <keepalive-time time="10" unit="seconds"/>
+                </long-running-threads>
+            </default-workmanager>
+            <cached-connection-manager/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:jmx:1.3">
+            <expose-resolved-model/>
+            <expose-expression-model/>
+            <remoting-connector/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+            <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:jsf:1.1"/>
+        <subsystem xmlns="urn:jboss:domain:mail:3.0">
+            <mail-session name="default" jndi-name="java:jboss/mail/Default">
+                <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+            </mail-session>
+        </subsystem>
+        <subsystem xmlns="urn:wildfly:microprofile-config-smallrye:1.0"/>
+        <subsystem xmlns="urn:wildfly:microprofile-health-smallrye:1.0" security-enabled="false"/>
+        <subsystem xmlns="urn:wildfly:microprofile-opentracing-smallrye:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:naming:2.0">
+            <remote-naming/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:remoting:4.0">
+            <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:resource-adapters:5.0"/>
+        <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+        <subsystem xmlns="urn:jboss:domain:security:2.0">
+            <security-domains>
+                <security-domain name="other" cache-type="default">
+                    <authentication>
+                        <login-module code="Remoting" flag="optional">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                        <login-module code="RealmDirect" flag="required">
+                            <module-option name="password-stacking" value="useFirstPass"/>
+                        </login-module>
+                    </authentication>
+                </security-domain>
+                <security-domain name="jboss-web-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+                <security-domain name="jaspitest" cache-type="default">
+                    <authentication-jaspi>
+                        <login-module-stack name="dummy">
+                            <login-module code="Dummy" flag="optional"/>
+                        </login-module-stack>
+                        <auth-module code="Dummy"/>
+                    </authentication-jaspi>
+                </security-domain>
+                <security-domain name="jboss-ejb-policy" cache-type="default">
+                    <authorization>
+                        <policy-module code="Delegating" flag="required"/>
+                    </authorization>
+                </security-domain>
+            </security-domains>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:security-manager:1.0">
+            <deployment-permissions>
+                <maximum-set>
+                    <permission class="java.security.AllPermission"/>
+                </maximum-set>
+            </deployment-permissions>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:transactions:5.0">
+            <core-environment node-identifier="${jboss.tx.node.id:1}">
+                <process-id>
+                    <uuid/>
+                </process-id>
+            </core-environment>
+            <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+            <object-store path="tx-object-store" relative-to="jboss.server.data.dir"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:undertow:7.0" default-server="default-server" default-virtual-host="default-host" default-servlet-container="default" default-security-domain="other">
+            <buffer-cache name="default"/>
+            <server name="default-server">
+                <http-listener name="default" socket-binding="http" redirect-socket="https" enable-http2="true"/>
+                <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/>
+                <host name="default-host" alias="localhost">
+                    <location name="/" handler="welcome-content"/>
+                    <http-invoker security-realm="ApplicationRealm"/>
+                </host>
+            </server>
+            <servlet-container name="default">
+                <jsp-config/>
+                <websockets/>
+            </servlet-container>
+            <handlers>
+                <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
+            </handlers>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:webservices:2.0">
+            <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+            <endpoint-config name="Standard-Endpoint-Config"/>
+            <endpoint-config name="Recording-Endpoint-Config">
+                <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+                    <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+                </pre-handler-chain>
+            </endpoint-config>
+            <client-config name="Standard-Client-Config"/>
+        </subsystem>
+        <subsystem xmlns="urn:jboss:domain:weld:4.0"/>
+    </profile>
+    <interfaces>
+        <interface name="management">
+            <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+        </interface>
+        <interface name="public">
+            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+        </interface>
+    </interfaces>
+    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
+        <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/>
+        <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/>
+        <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/>
+        <socket-binding name="http" port="${jboss.http.port:8080}"/>
+        <socket-binding name="https" port="${jboss.https.port:8443}"/>
+        <socket-binding name="txn-recovery-environment" port="4712"/>
+        <socket-binding name="txn-status-manager" port="4713"/>
+        <outbound-socket-binding name="mail-smtp">
+            <remote-destination host="localhost" port="25"/>
+        </outbound-socket-binding>
+    </socket-binding-group>
+</server>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..75e1b4e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,29 @@
+FROM jboss/wildfly:14.0.1.Final
+
+# User root user to install software
+USER root
+RUN yum -y install expect
+RUN yum -y install postgresql
+RUN yum -y install ant
+
+# Compile and copy .ear to deployments
+ADD ./1.sources/  /opt/jboss/
+RUN cd /opt/jboss/MyHealth && ant
+RUN mv /opt/jboss/MyHealth/dist/MyHealth.ear /opt/jboss/wildfly/standalone/deployments
+
+# Switch back to jboss user
+USER jboss
+
+ADD ./4.config/createApplicationUser.sh /opt/jboss/wildfly/bin/
+ADD ./4.config/createManagementUser.sh /opt/jboss/wildfly/bin/
+
+RUN cd /opt/jboss/wildfly/bin && ./createApplicationUser.sh 
+RUN cd /opt/jboss/wildfly/bin && ./createManagementUser.sh
+
+RUN mkdir /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/
+RUN mkdir /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/main
+ADD ./4.config/postgresql-9.4.1209.jar /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/main
+ADD ./4.config/module.xml /opt/jboss/wildfly/modules/system/layers/base/org/postgresql/main
+ADD ./4.config/standalone.xml /opt/jboss/wildfly/standalone/configuration/standalone.xml
+
+CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0"]
\ No newline at end of file
diff --git a/README.md b/README.md
index 9a7f868..26b6c64 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
-**Página de inicio del proyecto My Health del Grupo 2**
+## Página de inicio del proyecto My Health del Grupo 2
 
 
-Organización de directorios:
+### Organización de directorios:
 * sources: Código fuente y proyecto eclipse
 * database: Scripts SQL para crear la estructura de base de datos y los datos de prueba
 * doc: Directorio para ubicar la documentación compartida.
+
+### Instrucciones de despliegue e instalación
+Las instrucciones detalladas de despliegue y configuración están descritas en el documento [install.md](install.md)
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..3b6d660
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '3'
+services:
+    postgres:
+        image: postgres:10.11-alpine
+        ports:
+            - "5432:5432"
+        environment:
+            - POSTGRES_USER=USER
+            - POSTGRES_PASSWORD=PASSWORD
+            - POSTGRES_DB=myhealth
+        volumes:
+            - ./2.database/01.CreateTables.sql:/docker-entrypoint-initdb.d/01.CreateTables.sql
+            - ./2.database/02.Datos_prueba.sql:/docker-entrypoint-initdb.d/02.Datos_prueba.sql
+    wildfly:
+        build: .
+        ports:
+            - "8080:8080"
+        environment:
+            - DB_USER=USER
+            - DB_PASS=PASSWORD
+            - JBOSS_HOME=/opt/jboss/wildfly
+        depends_on:
+            - postgres
+
diff --git a/install.md b/install.md
new file mode 100644
index 0000000..beecf98
--- /dev/null
+++ b/install.md
@@ -0,0 +1,34 @@
+## Instrucciones de despliegue e instalación
+### 1. Crear esquema de base de datos y tablas:
+Se debe crear un esquema nuevo en PostgreSQL y conceder permisos al usuario USER. Esto puede realizarse ejecutando el script incluido con la solución llamado:
+* 01.CreateTables.sql
+
+### 2. Inserción de datos iniciales:
+Se debe ejecutar el script, incluido con la solución, que crea la tabla e inserta los datos de prueba:
+* 02.Datos_prueba.sql
+
+### 3. Creación del DataSource:
+Para este proyecto se utilizará el mismo datasource que para el caso práctico, si no está creado debe añadirse al fichero JBOSS_HOME\standalone\configuration\standalone.xlm.
+El usuario y contraseña de base de datos que se han utilizado en el datasource es USER con contraseña PASSWORD.
+
+	<datasource jta="false" jndi-name="java:jboss/postgresDS" pool-name="postgresDS" 
+		enabled="true" use-java-context="true" use-ccm="false" statistics-enabled="true">
+		<connection-url>jdbc:postgresql://localhost:5432/postgres</connection-url>
+		<driver-class>org.postgresql.Driver</driver-class>
+		<driver>postgresql</driver>
+		<security>
+			<user-name>USER</user-name>
+			<password>PASSWORD</password>
+		</security>
+	</datasource>
+
+### 4. Ejecutar la compilación y despliegue del proyecto
+Acceder al directorio con el código fuente ([git-folder]/1.sources/MyHealth), y donde está ubicado el archivo de compilación de ant build.xml, ejecutar `ant` en este directorio, el proyecto debería compilarse y desplegarse automáticamente en el servidor JBOSS local.
+
+## Instrucciones de despliegue alternativo con docker 
+
+### pre-requisitos:
+Instalar docker desktop
+
+### Levantar ambiente con un solo comando:
+Abrimos la consola y nos posicionamos en el root del proyecto donde se encuentra el archivo `docker-compose.yml` y mediante la ejecución del comando `docker-compose up` levantaremos un contenedor de postgresql con el schema, tablas y permisos configurado y un contenedor con jboss/wildfly también configurado en el que compilaremos la ultima versión del producto y la desplegaremos. 
\ No newline at end of file