diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
index 11dca693..69bc072a 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/build-impl.xml
@@ -531,7 +531,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-codec-1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-codec-1.3.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.commons-collections-3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-collections-3.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.commons-digester-1.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-digester-1.8.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.commons-httpclient-3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-httpclient-3.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.commons-io-1.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-io-1.4.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.commons-lang-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-lang-2.4.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.commons-logging-1.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-logging-1.1.1.jar" todir="${dist.ear.dir}"/>
@@ -541,11 +540,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.evologger.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evologger.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.evolute.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evolute.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.fop.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.fop.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.httpclient-4.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.httpclient-4.0.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.iText-2.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.iText-2.0.8.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.jai_imageio.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jai_imageio.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.jakarta-oro-2.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jakarta-oro-2.0.8.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.jdbcappender.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jdbcappender.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.jdom.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jdom.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.log4j-1.2.15.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.mail.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.mail.jar" todir="${dist.ear.dir}"/>
@@ -554,9 +551,12 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.org.springframework.core-3.0.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.org.springframework.core-3.0.0.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.poi-3.5-beta6-20090622.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.poi-3.5-beta6-20090622.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.poi-ooxml-3.5-beta6-20090622.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.poi-ooxml-3.5-beta6-20090622.jar" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.postgresql-9.0-801.jdbc4.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.serializer-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.serializer-2.7.0.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.shst.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.shst.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.commons-httpclient-3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-httpclient-3.1.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.httpclient-4.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.httpclient-4.0.1.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.jdbcappender.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.jdbcappender.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.postgresql-9.0-801.jdbc4.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.spring-ws-core-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-core-1.5.9.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.spring-ws-core-tiger-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-core-tiger-1.5.9.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.spring-ws-support-1.5.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.spring-ws-support-1.5.9.jar" todir="${dist.ear.dir}"/>
@@ -579,7 +579,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${libs.jstl11.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${manifest.libs.jsf-designtime.classpath} ${manifest.libs.jsfsupport-designtime.classpath} ${manifest.libs.webui-designtime.classpath} ${manifest.libs.jdbcsupport-designtime.classpath} ${manifest.libs.theme-default.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.rowset-ri.classpath} ${manifest.file.reference.activation.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-codec-1.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-httpclient-3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.commons-vfs-1.0.jar} ${manifest.file.reference.dom4j-1.6.1.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.httpclient-4.0.1.jar} ${manifest.file.reference.iText-2.0.8.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jakarta-oro-2.0.8.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar} ${manifest.file.reference.org.springframework.beans-3.0.0.jar} ${manifest.file.reference.org.springframework.context-3.0.0.jar} ${manifest.file.reference.org.springframework.core-3.0.0.jar} ${manifest.file.reference.poi-3.5-beta6-20090622.jar} ${manifest.file.reference.poi-ooxml-3.5-beta6-20090622.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.spring-ws-core-1.5.9.jar} ${manifest.file.reference.spring-ws-core-tiger-1.5.9.jar} ${manifest.file.reference.spring-ws-support-1.5.9.jar} ${manifest.file.reference.spring-xml-1.5.9.jar} ${manifest.file.reference.truelicense.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.commons-el-1.0.jar} ${manifest.file.reference.xmlParserAPIs-2.0.2.jar} ${manifest.file.reference.tomahawk-1.1.10.jar} "/>
+            <attribute name="Class-Path" value="${manifest.libs.jsf-designtime.classpath} ${manifest.libs.jsfsupport-designtime.classpath} ${manifest.libs.webui-designtime.classpath} ${manifest.libs.jdbcsupport-designtime.classpath} ${manifest.libs.theme-default.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.rowset-ri.classpath} ${manifest.file.reference.activation.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.commons-beanutils-1.8.3.jar} ${manifest.file.reference.commons-codec-1.3.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-digester-1.8.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-lang-2.4.jar} ${manifest.file.reference.commons-logging-1.1.1.jar} ${manifest.file.reference.commons-validator-1.3.1.jar} ${manifest.file.reference.commons-vfs-1.0.jar} ${manifest.file.reference.dom4j-1.6.1.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.iText-2.0.8.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.jakarta-oro-2.0.8.jar} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.mail.jar} ${manifest.file.reference.org.springframework.beans-3.0.0.jar} ${manifest.file.reference.org.springframework.context-3.0.0.jar} ${manifest.file.reference.org.springframework.core-3.0.0.jar} ${manifest.file.reference.poi-3.5-beta6-20090622.jar} ${manifest.file.reference.poi-ooxml-3.5-beta6-20090622.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.shst.jar} ${manifest.file.reference.commons-httpclient-3.1.jar} ${manifest.file.reference.httpclient-4.0.1.jar} ${manifest.file.reference.jdbcappender.jar} ${manifest.file.reference.postgresql-9.0-801.jdbc4.jar} ${manifest.file.reference.spring-ws-core-1.5.9.jar} ${manifest.file.reference.spring-ws-core-tiger-1.5.9.jar} ${manifest.file.reference.spring-ws-support-1.5.9.jar} ${manifest.file.reference.spring-xml-1.5.9.jar} ${manifest.file.reference.truelicense.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.commons-el-1.0.jar} ${manifest.file.reference.xmlParserAPIs-2.0.2.jar} ${manifest.file.reference.tomahawk-1.1.10.jar} "/>
         </manifest>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@@ -598,7 +598,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-codec-1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-collections-3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-digester-1.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.commons-httpclient-3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-io-1.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-logging-1.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -608,11 +607,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.evologger.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.evolute.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.fop.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.httpclient-4.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.iText-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jai_imageio.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jakarta-oro-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jdbcappender.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jdom.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.mail.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -621,9 +618,12 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.org.springframework.core-3.0.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.poi-3.5-beta6-20090622.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.poi-ooxml-3.5-beta6-20090622.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.serializer-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.shst.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-httpclient-3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jdbcappender.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.spring-ws-core-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.spring-ws-core-tiger-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.spring-ws-support-1.5.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
index 9143cc1c..b6e376e3 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=2d68f117
+build.xml.data.CRC32=533fa109
 build.xml.script.CRC32=97b5d0ef
 build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=2d68f117
-nbproject/build-impl.xml.script.CRC32=0cb83ca1
+nbproject/build-impl.xml.data.CRC32=533fa109
+nbproject/build-impl.xml.script.CRC32=6e839b17
 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData b/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData
index bf242b1d..6e499eaa 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/managed-beans.NavData
@@ -6,8 +6,8 @@
         <Node id="RecuperarPassword.jsp" x="150" y="600" zoom="true"/>
         <Node id="FormDirGerRh.jsp" x="150" y="450" zoom="true"/>
         <Node id="FormGestor.jsp" x="650" y="300" zoom="true"/>
-        <Node id="Acesso.jsp" x="650" y="150" zoom="true"/>
         <Node id="Erro.jsp" x="900" y="300" zoom="true"/>
+        <Node id="Acesso.jsp" x="650" y="150" zoom="true"/>
         <Node id="FormRH.jsp" x="400" y="450" zoom="true"/>
         <Node id="EstatisticasProcesso.jsp" x="150" y="900" zoom="true"/>
         <Node id="AnaliseAcidenteTrabalho.jsp" x="900" y="150" zoom="true"/>
@@ -15,15 +15,15 @@
         <Node id="NovoUtilizador.jsp" x="150" y="300" zoom="true"/>
         <Node id="FormDirSiprp.jsp" x="1400" y="150" zoom="true"/>
         <Node id="FichaUtilizador.jsp" x="900" y="450" zoom="true"/>
-        <Node id="FormHS.jsp" x="150" y="150" zoom="true"/>
         <Node id="FormMedico.jsp" x="400" y="750" zoom="true"/>
+        <Node id="FormHS.jsp" x="150" y="150" zoom="true"/>
         <Node id="EnviarCorrecao.jsp" x="650" y="450" zoom="true"/>
         <Node id="UtilizadorFields.jsp" x="150" y="750" zoom="true"/>
         <Node id="ConfirmarDesactivar.jsp" x="1650" y="150" zoom="true"/>
         <Node id="Dummy.jsp" x="400" y="600" zoom="true"/>
         <Node id="LoadImage.jsp" x="650" y="600" zoom="true"/>
-        <Node id="ViewAnaliseAcidenteTrabalho.jsp" x="1150" y="150" zoom="true"/>
         <Node id="Login.jsp" x="400" y="300" zoom="true"/>
+        <Node id="ViewAnaliseAcidenteTrabalho.jsp" x="1150" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
index 865a85fc..2a126fff 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.properties
@@ -88,7 +88,6 @@ javac.classpath=\
     ${file.reference.commons-codec-1.3.jar}:\
     ${file.reference.commons-collections-3.1.jar}:\
     ${file.reference.commons-digester-1.8.jar}:\
-    ${file.reference.commons-httpclient-3.1.jar}:\
     ${file.reference.commons-io-1.4.jar}:\
     ${file.reference.commons-lang-2.4.jar}:\
     ${file.reference.commons-logging-1.1.1.jar}:\
@@ -98,11 +97,9 @@ javac.classpath=\
     ${file.reference.evologger.jar}:\
     ${file.reference.evolute.jar}:\
     ${file.reference.fop.jar}:\
-    ${file.reference.httpclient-4.0.1.jar}:\
     ${file.reference.iText-2.0.8.jar}:\
     ${file.reference.jai_imageio.jar}:\
     ${file.reference.jakarta-oro-2.0.8.jar}:\
-    ${file.reference.jdbcappender.jar}:\
     ${file.reference.jdom.jar}:\
     ${file.reference.log4j-1.2.15.jar}:\
     ${file.reference.mail.jar}:\
@@ -111,9 +108,12 @@ javac.classpath=\
     ${file.reference.org.springframework.core-3.0.0.jar}:\
     ${file.reference.poi-3.5-beta6-20090622.jar}:\
     ${file.reference.poi-ooxml-3.5-beta6-20090622.jar}:\
-    ${file.reference.postgresql-9.0-801.jdbc4.jar}:\
     ${file.reference.serializer-2.7.0.jar}:\
     ${file.reference.shst.jar}:\
+    ${file.reference.commons-httpclient-3.1.jar}:\
+    ${file.reference.httpclient-4.0.1.jar}:\
+    ${file.reference.jdbcappender.jar}:\
+    ${file.reference.postgresql-9.0-801.jdbc4.jar}:\
     ${file.reference.spring-ws-core-1.5.9.jar}:\
     ${file.reference.spring-ws-core-tiger-1.5.9.jar}:\
     ${file.reference.spring-ws-support-1.5.9.jar}:\
diff --git a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml
index aa2dfee7..2c04bc81 100644
--- a/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml
+++ b/trunk/AnaliseAcidentesTrabalho/nbproject/project.xml
@@ -67,10 +67,6 @@
                     <file>${file.reference.commons-digester-1.8.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library>
-                    <file>${file.reference.commons-httpclient-3.1.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
                 <library>
                     <file>${file.reference.commons-io-1.4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -107,10 +103,6 @@
                     <file>${file.reference.fop.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library>
-                    <file>${file.reference.httpclient-4.0.1.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
                 <library>
                     <file>${file.reference.iText-2.0.8.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -123,10 +115,6 @@
                     <file>${file.reference.jakarta-oro-2.0.8.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library>
-                    <file>${file.reference.jdbcappender.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
                 <library>
                     <file>${file.reference.jdom.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -160,15 +148,27 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.postgresql-9.0-801.jdbc4.jar}</file>
+                    <file>${file.reference.serializer-2.7.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.serializer-2.7.0.jar}</file>
+                    <file>${file.reference.shst.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
-                    <file>${file.reference.shst.jar}</file>
+                    <file>${file.reference.commons-httpclient-3.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.httpclient-4.0.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.jdbcappender.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library>
+                    <file>${file.reference.postgresql-9.0-801.jdbc4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library>
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java
index 8f133189..cf52a5f6 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/analiseacidentestrabalho/EstatisticasProcesso.java
@@ -127,12 +127,14 @@ public class EstatisticasProcesso extends AbstractPageBean
 //	{
 //		this.calDataOcorrencia = c;
 //	}
+
 	
 	private Date calDataOcorrencia = null;
 	public Date getCalDataOcorrencia()
 	{
 		return calDataOcorrencia;
 	}
+
 	public void setCalDataOcorrencia( Date calDataOcorrencia )
 	{
 		this.calDataOcorrencia = calDataOcorrencia;
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/AATContextListener.java b/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/AATContextListener.java
index b1274805..186d6a8d 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/AATContextListener.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/phaselistener/AATContextListener.java
@@ -30,15 +30,7 @@ public class AATContextListener implements ServletContextListener
 		startedTime = System.currentTimeMillis();
 		System.out.println( "\n\ncontextInitialized : " + startedTime );
 
-		try
-		{
-			System.out.println( "\nInitializing error logger ..." );
-			AnaliseAcidentesTrabalhoLogger.init();
-		}
-		catch ( Exception e )
-		{
-			e.printStackTrace( System.out );
-		}
+		
 
 		try
 		{
@@ -61,6 +53,16 @@ public class AATContextListener implements ServletContextListener
 		{
 			e.printStackTrace();
 		}
+
+		try
+		{
+			System.out.println( "\nInitializing error logger ..." );
+			AnaliseAcidentesTrabalhoLogger.init();
+		}
+		catch ( Exception e )
+		{
+			e.printStackTrace( System.out );
+		}
 		
 	}
 
diff --git a/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java b/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java
index dbbce6be..f447dc65 100644
--- a/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java
+++ b/trunk/AnaliseAcidentesTrabalho/src/java/utils/AnaliseAcidentesTrabalhoLogger.java
@@ -10,7 +10,6 @@ import com.evolute.utils.error.Logger;
 import com.evolute.utils.error.LoggerProperties;
 import com.evolute.utils.error.ProjectsEnum;
 import com.evolute.utils.error.ws.WSLogger;
-import com.evolute.utils.network.proxy.EvoProxyObject;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -35,11 +34,11 @@ public class AnaliseAcidentesTrabalhoLogger
         String host = "";
         String port = "";
 
-        EvoProxyObject.configSystemProxySelector();
-        EvoProxyObject.getProxy( user, pass, host, port );
+//        EvoProxyObject.configSystemProxySelector();
+//        EvoProxyObject.getProxy( user, pass, host, port );
         
 		Logger logger = new WSLogger( properties );
-		ErrorLogger.initializeLogger( logger );
+		ErrorLogger.initializeLogger( logger, true, false );
 	}
 
 }
diff --git a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
index d7b19f2d..b27c0f2e 100644
--- a/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
+++ b/trunk/AnaliseAcidentesTrabalho/web/NovoUtilizador.jsp
@@ -6,6 +6,7 @@
             <ui:html binding="#{NovoUtilizador.html1}" id="html1">
                 <ui:head binding="#{NovoUtilizador.head1}" id="head1">
                     <ui:link binding="#{NovoUtilizador.link1}" id="link1" url="/resources/stylesheet.css"/>
+					<ui:script type="text/javascript" url="/resources/RaveThemeFix.js" />
                     <script>
 
 			function showPdf()
@@ -31,10 +32,12 @@
                                if(rb.id == "form1:rbCatDirRh")
                                {
                                   document.getElementById("form1:gridTrabalhadores").className = "";
+								  showTable( "form1:tblTrabalhadores" );
                                }
                                else if(rb.id == "form1:rbCatGestao")
                                {
-                                  document.getElementById("form1:gridTrabalhadores").className = "";                               
+                                  document.getElementById("form1:gridTrabalhadores").className = "";
+								  showTable( "form1:tblTrabalhadores" );
                                }
                                else if(rb.id == "form1:rbCatHs")
                                {
@@ -46,20 +49,24 @@
                                }                               
                                else if(rb.id == "form1:rbCatRh")
                                {
-                                  document.getElementById("form1:gridTrabalhadores").className = "";                               
+                                  document.getElementById("form1:gridTrabalhadores").className = "";
+								  showTable( "form1:tblTrabalhadores" );
                                }                              
                                else if(rb.id == "form1:rbCatSeg")
                                {
-                                  document.getElementById("form1:gridTrabalhadores").className = "";                               
+                                  document.getElementById("form1:gridTrabalhadores").className = "";
+								  showTable( "form1:tblTrabalhadores" );
                                }                               
                                else if(rb.id == "form1:rbCatDirNacSeg")
                                {
-                                  document.getElementById("form1:gridTrabalhadores").className = "";                               
+                                  document.getElementById("form1:gridTrabalhadores").className = "";
+								  showTable( "form1:tblTrabalhadores" );
                                   //document.getElementById("form1:gridOutro").className = "hidden";                                   
                                }                                                              
                                else if(rb.id == "form1:rbCatDirLoja")
                                {
-                                  document.getElementById("form1:gridTrabalhadores").className = "";                               
+                                  document.getElementById("form1:gridTrabalhadores").className = "";
+								  showTable( "form1:tblTrabalhadores" );
                                   //document.getElementById("form1:gridOutro").className = "hidden";                                                                     
                                }                                                                                             
                             } 
@@ -78,8 +85,9 @@
                         }
                         
                     </script>
+					
                 </ui:head>
-                <ui:body binding="#{NovoUtilizador.body1}" id="body1" onLoad="highlight()" style="-rave-layout: grid">
+                <ui:body binding="#{NovoUtilizador.body1}" id="body1" onLoad="showTables( 'form1:tblTrabalhadores' );" style="-rave-layout: grid">
                     <ui:form binding="#{NovoUtilizador.form1}" id="form1">
                         <h:panelGrid binding="#{NovoUtilizador.gridBase1}" columns="1" id="gridBase1"
                             style="height: 39px; left: 0px; top: 72px; position: absolute; width: 100%" styleClass="centerBlock">