diff --git a/trunk/PlanosActuacao/.ant-targets-build.xml b/trunk/PlanosActuacao/.ant-targets-build.xml
new file mode 100644
index 00000000..f91bf622
--- /dev/null
+++ b/trunk/PlanosActuacao/.ant-targets-build.xml
@@ -0,0 +1,21 @@
+app-build
+app-clean
+app-create-jar
+app-deploy
+app-run
+clean
+clean-ear
+compile
+compile-jsps
+debug
+default
+dist
+dist-ear
+docs-generate-upload
+javadoc
+run
+run-LEAF
+run-batch-deployer
+run-codegen
+test
+test-single
diff --git a/trunk/PlanosActuacao/ant/common/evo-app-load-properties.xml b/trunk/PlanosActuacao/ant/common/evo-app-load-properties.xml
index dc69ec77..71186559 100644
--- a/trunk/PlanosActuacao/ant/common/evo-app-load-properties.xml
+++ b/trunk/PlanosActuacao/ant/common/evo-app-load-properties.xml
@@ -17,7 +17,7 @@
 		<property name="docs.dir" value="${app.dir}/docs" />
 		<property name="docs.api.dir" value="${docs.dir}/api" />
 		<property name="app.src.dir" value="${app.dir}/src" />
-		<property name="app.lib.dir" value="${app.dir}/lib" />
+		<property name="app.lib.dir" value="${app.dir}/web/WEB-INF/lib" />
 		<property name="deploy.project.relative.lib.dir" value="lib" />
 		<property name="app.dist.dir" value="${app.dir}/dist" />
 		<property name="app.dist.lib.dir" value="${app.dist.dir}/lib" />
@@ -36,6 +36,7 @@
 		<path id="app.build.classpath">
 			<pathelement location="${app.build.dir}" />
 			<path refid="app.jar.classpath" />
+			<path refid="lib.tools.classpath" />
 		</path>
 		
 		<path id="lib.docs.classpath">
diff --git a/trunk/PlanosActuacao/build.xml b/trunk/PlanosActuacao/build.xml
index 59d2394e..c418d553 100644
--- a/trunk/PlanosActuacao/build.xml
+++ b/trunk/PlanosActuacao/build.xml
@@ -13,7 +13,7 @@
 
 	<import file="ant/evo-app-multiple-client-build.xml" />
 
-    <!--
+	<!--
 
     There exist several targets which are by default empty and which can be 
     used for execution of your tasks. These targets are usually executed 
diff --git a/trunk/PlanosActuacao/dependenciesCache/dependencies.txt b/trunk/PlanosActuacao/dependenciesCache/dependencies.txt
index 6bd0ed73..d857ed2c 100644
--- a/trunk/PlanosActuacao/dependenciesCache/dependencies.txt
+++ b/trunk/PlanosActuacao/dependenciesCache/dependencies.txt
@@ -7126,15 +7126,15 @@ java.lang.String
 java.lang.Integer
 db.providers.RelatoriosDataProvider
 java.lang.Exception
-||:web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioNormalizacaoData
-web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioNormalizacaoData
-db.data.siprp_local.inner.HsRelatorioNormalizacao
-||:web.WEB-INF.classes.db.data.siprp_local.outer.CurTopicosAulasData
-db.data.siprp_local.inner.CurTopicosAulas
-web.WEB-INF.classes.db.data.siprp_local.outer.CurTopicosAulasData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.PaisesData
 web.WEB-INF.classes.db.data.siprp_local.outer.PaisesData
 db.data.siprp_local.inner.Paises
+||:web.WEB-INF.classes.db.data.siprp_local.outer.CurTopicosAulasData
+db.data.siprp_local.inner.CurTopicosAulas
+web.WEB-INF.classes.db.data.siprp_local.outer.CurTopicosAulasData
+||:web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioNormalizacaoData
+web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioNormalizacaoData
+db.data.siprp_local.inner.HsRelatorioNormalizacao
 ||:web.WEB-INF.classes.mail.MailNextPhase$RESPONSAVEL_SEGURANCA_TO_DIRECTOR_LOJA
 java.lang.Object
 web.WEB-INF.classes.mail.MailNextPhase$RESPONSAVEL_SEGURANCA_TO_DIRECTOR_LOJA
@@ -7161,9 +7161,6 @@ com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
 db.data.siprp_local.inner.TiposExamesComp
-||:web.WEB-INF.classes.db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData
-web.WEB-INF.classes.db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData
-db.data.siprp_local.inner.TrabalhadoresConsultasDatasEmails
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.CurFormadores
 java.lang.System
 db.data.siprp_local.outer.CurTopicosData
@@ -7188,12 +7185,12 @@ com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 db.data.siprp_local.outer.CurPresencasData
 java.lang.String
+||:web.WEB-INF.classes.db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData
+web.WEB-INF.classes.db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData
+db.data.siprp_local.inner.TrabalhadoresConsultasDatasEmails
 ||:web.WEB-INF.classes.db.data.siprp.outer.EstabelecimentosData
 db.data.siprp.inner.Estabelecimentos
 web.WEB-INF.classes.db.data.siprp.outer.EstabelecimentosData
-||:web.WEB-INF.classes.db.data.siprp.outer.PlanosActuacaoData
-db.data.siprp.inner.PlanosActuacao
-web.WEB-INF.classes.db.data.siprp.outer.PlanosActuacaoData
 ||:db.data.siprp.inner.Avisos
 java.lang.System
 com.evolute.entity.ForeignKey
@@ -7214,30 +7211,33 @@ db.data.siprp.inner.Avisos
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
+||:web.WEB-INF.classes.db.data.siprp.outer.PlanosActuacaoData
+db.data.siprp.inner.PlanosActuacao
+web.WEB-INF.classes.db.data.siprp.outer.PlanosActuacaoData
 ||:db.data.siprp.outer.ExamesData
 db.data.siprp.inner.Exames
 db.data.siprp.outer.ExamesData
-||:db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData
-db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData
-db.data.siprp_local.inner.HsNormalizacaoEstabelecimento
+||:web.WEB-INF.classes.db.data.siprp_local.outer.LembretesTiposData
+web.WEB-INF.classes.db.data.siprp_local.outer.LembretesTiposData
+db.data.siprp_local.inner.LembretesTipos
+||:web.WEB-INF.classes.db.data.siprp.outer.PlanoValoresQualitativosData
+web.WEB-INF.classes.db.data.siprp.outer.PlanoValoresQualitativosData
+db.data.siprp.inner.PlanoValoresQualitativos
 ||:planosactuacao.SessionBean1$PAGINATION_ENUM
 planosactuacao.SessionBean1$PAGINATION_ENUM
 java.lang.Enum
 planosactuacao.SessionBean1
 [Lplanosactuacao.SessionBean1$PAGINATION_ENUM;
 java.lang.Integer
-||:web.WEB-INF.classes.db.data.siprp.outer.PlanoValoresQualitativosData
-web.WEB-INF.classes.db.data.siprp.outer.PlanoValoresQualitativosData
-db.data.siprp.inner.PlanoValoresQualitativos
-||:web.WEB-INF.classes.db.data.siprp_local.outer.LembretesTiposData
-web.WEB-INF.classes.db.data.siprp_local.outer.LembretesTiposData
-db.data.siprp_local.inner.LembretesTipos
-||:db.data.siprp_local.outer.MedicosData
-db.data.siprp_local.inner.Medicos
-db.data.siprp_local.outer.MedicosData
+||:db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData
+db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData
+db.data.siprp_local.inner.HsNormalizacaoEstabelecimento
 ||:db.data.siprp_local.outer.HsEmailData
 db.data.siprp_local.outer.HsEmailData
 db.data.siprp_local.inner.HsEmail
+||:db.data.siprp_local.outer.MedicosData
+db.data.siprp_local.inner.Medicos
+db.data.siprp_local.outer.MedicosData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.CurPresencasData
 web.WEB-INF.classes.db.data.siprp_local.outer.CurPresencasData
 db.data.siprp_local.inner.CurPresencas
@@ -7464,12 +7464,12 @@ web.WEB-INF.classes.db.data.siprp_local.outer.HsEquipamentoData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.HsAreaData
 web.WEB-INF.classes.db.data.siprp_local.outer.HsAreaData
 db.data.siprp_local.inner.HsArea
-||:web.WEB-INF.classes.db.data.siprp.outer.EstadoMedidasData
-db.data.siprp.inner.EstadoMedidas
-web.WEB-INF.classes.db.data.siprp.outer.EstadoMedidasData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.MarcacoesTrabalhadorData
 db.data.siprp_local.inner.MarcacoesTrabalhador
 web.WEB-INF.classes.db.data.siprp_local.outer.MarcacoesTrabalhadorData
+||:web.WEB-INF.classes.db.data.siprp.outer.EstadoMedidasData
+db.data.siprp.inner.EstadoMedidas
+web.WEB-INF.classes.db.data.siprp.outer.EstadoMedidasData
 ||:db.DBPropertiesLoader
 com.evolute.properties.EvoAbstractPropertiesLoader
 java.lang.StringBuilder
@@ -7485,9 +7485,6 @@ db.data.siprp_local.inner.CurNumeroCertificado
 ||:db.data.siprp_local.outer.CurNumeroCertificadoFormadorData
 db.data.siprp_local.inner.CurNumeroCertificadoFormador
 db.data.siprp_local.outer.CurNumeroCertificadoFormadorData
-||:db.data.siprp.outer.MedidasData
-db.data.siprp.inner.Medidas
-db.data.siprp.outer.MedidasData
 ||:db.data.siprp_local.inner.TrabalhadoresEcdsAnalise
 java.lang.System
 com.evolute.entity.ForeignKey
@@ -7508,6 +7505,9 @@ com.evolute.entity.evo.EvoDataObject
 db.data.siprp_local.outer.PrestadoresData
 java.lang.Object
 java.lang.String
+||:db.data.siprp.outer.MedidasData
+db.data.siprp.inner.Medidas
+db.data.siprp.outer.MedidasData
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.AptOutrasViajante
 java.lang.System
 com.evolute.entity.ForeignKey
@@ -7527,9 +7527,10 @@ com.evolute.entity.evo.EvoDataObject
 db.data.siprp_local.outer.AptAppointmentData
 java.lang.Object
 java.lang.String
-||:db.data.siprp_local.outer.EvoUsrRoleData
-db.data.siprp_local.outer.EvoUsrRoleData
-db.data.siprp_local.inner.EvoUsrRole
+||:web.WEB-INF.classes.db.entidades.ValorQualitativo
+java.lang.Object
+web.WEB-INF.classes.db.entidades.ValorQualitativo
+java.io.Serializable
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.HsRelatorioRiscoValorQualitativo
 java.lang.System
 java.util.LinkedList
@@ -7551,10 +7552,9 @@ java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.entidades.ValorQualitativo
-java.lang.Object
-web.WEB-INF.classes.db.entidades.ValorQualitativo
-java.io.Serializable
+||:db.data.siprp_local.outer.EvoUsrRoleData
+db.data.siprp_local.outer.EvoUsrRoleData
+db.data.siprp_local.inner.EvoUsrRole
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.HsEmailEstabelecimento
 db.data.siprp_local.outer.HsEmailData
 com.evolute.entity.evo.EvoDataException
@@ -7573,9 +7573,6 @@ java.lang.Integer
 java.lang.String
 web.WEB-INF.classes.db.data.siprp_local.inner.HsEmailEstabelecimento
 java.lang.Exception
-||:db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData
-db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData
-db.data.siprp_local.inner.TrabalhadoresEcdsDatasEmails
 ||:db.data.siprp_local.inner.EvoUsrUsersRoles
 java.lang.System
 com.evolute.entity.ForeignKey
@@ -7595,9 +7592,9 @@ com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
 db.data.siprp_local.inner.EvoUsrUsersRoles
-||:db.data.siprp.outer.TiposUtilizadoresData
-db.data.siprp.outer.TiposUtilizadoresData
-db.data.siprp.inner.TiposUtilizadores
+||:db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData
+db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData
+db.data.siprp_local.inner.TrabalhadoresEcdsDatasEmails
 ||:db.data.siprp_local.inner.CurQuestionarioPergunta
 java.lang.System
 com.evolute.entity.ForeignKey
@@ -7620,36 +7617,21 @@ db.data.siprp_local.inner.CurQuestionarioPergunta
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
+||:db.data.siprp.outer.TiposUtilizadoresData
+db.data.siprp.outer.TiposUtilizadoresData
+db.data.siprp.inner.TiposUtilizadores
 ||:mail.MailNextPhase$DIRECTOR_LOJA_TO_DIRECTOR_NACIONAL_SEGURANCA
 java.lang.Object
 mail.MailNextPhase$DIRECTOR_LOJA_TO_DIRECTOR_NACIONAL_SEGURANCA
 java.lang.StringBuilder
 db.entidades.PlanoActuacao
 mail.MailNextPhase
-||:web.WEB-INF.classes.db.data.siprp_local.outer.CurFormandosCursosData
-web.WEB-INF.classes.db.data.siprp_local.outer.CurFormandosCursosData
-db.data.siprp_local.inner.CurFormandosCursos
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.PesDocumentoTipoData
 db.data.siprp_local.inner.PesDocumentoTipo
 web.WEB-INF.classes.db.data.siprp_local.outer.PesDocumentoTipoData
-||:db.data.siprp.inner.Causas
-com.evolute.entity.evo.EvoDataException
-java.lang.Boolean
-com.evolute.entity.utils.IntegerPrimaryKey
-db.data.siprp.inner.Causas
-java.lang.Class
-java.lang.System
-java.util.HashMap
-java.lang.Long
-java.lang.ClassCastException
-java.lang.Number
-com.evolute.entity.evo.EvoDataObject
-java.lang.Object
-com.evolute.utils.arrays.Virtual2DArray
-java.lang.String
-java.lang.RuntimeException
-java.lang.Integer
-java.lang.Exception
+||:web.WEB-INF.classes.db.data.siprp_local.outer.CurFormandosCursosData
+web.WEB-INF.classes.db.data.siprp_local.outer.CurFormandosCursosData
+db.data.siprp_local.inner.CurFormandosCursos
 ||:phaselistener.PASessionListener
 java.lang.Object
 javax.servlet.http.HttpSessionEvent
@@ -7659,23 +7641,23 @@ java.io.PrintStream
 phaselistener.PASessionListener
 javax.servlet.http.HttpSessionListener
 javax.servlet.http.HttpSession
-||:web.WEB-INF.classes.db.data.siprp_local.inner.HsPostoMedida
+||:db.data.siprp.inner.Causas
 com.evolute.entity.evo.EvoDataException
 java.lang.Boolean
 com.evolute.entity.utils.IntegerPrimaryKey
-com.evolute.entity.ForeignKey
-web.WEB-INF.classes.db.data.siprp_local.inner.HsPostoMedida
-db.data.siprp_local.outer.HsPostoData
+db.data.siprp.inner.Causas
 java.lang.Class
 java.lang.System
 java.util.HashMap
 java.lang.Long
-db.data.siprp_local.outer.HsMedidaData
+java.lang.ClassCastException
+java.lang.Number
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
+com.evolute.utils.arrays.Virtual2DArray
+java.lang.String
 java.lang.RuntimeException
 java.lang.Integer
-java.lang.String
 java.lang.Exception
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.TrabalhadoresEcdsDatas
 db.data.siprp_local.outer.TrabalhadoresEcdsData
@@ -7704,13 +7686,28 @@ com.evolute.entity.evo.EvoDataObject
 db.data.siprp_local.outer.PrestadoresData
 java.lang.Object
 java.lang.String
+||:web.WEB-INF.classes.db.data.siprp_local.inner.HsPostoMedida
+com.evolute.entity.evo.EvoDataException
+java.lang.Boolean
+com.evolute.entity.utils.IntegerPrimaryKey
+com.evolute.entity.ForeignKey
+web.WEB-INF.classes.db.data.siprp_local.inner.HsPostoMedida
+db.data.siprp_local.outer.HsPostoData
+java.lang.Class
+java.lang.System
+java.util.HashMap
+java.lang.Long
+db.data.siprp_local.outer.HsMedidaData
+com.evolute.entity.evo.EvoDataObject
+java.lang.Object
+java.lang.RuntimeException
+java.lang.Integer
+java.lang.String
+java.lang.Exception
 ||:db.entidades.Medida
 java.lang.Object
 java.io.Serializable
 db.entidades.Medida
-||:db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData
-db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData
-db.data.siprp_local.inner.FilFileMarcacoesEstabelecimento
 ||:planosactuacao.EditarPlano
 java.util.Set
 db.providers.UtilizadoresDataProvider
@@ -7780,6 +7777,13 @@ db.providers.PlanosDataProvider
 db.providers.RiscoLogic
 com.evolute.utils.error.ErrorLogger
 javax.el.ExpressionFactory
+||:db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData
+db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData
+db.data.siprp_local.inner.FilFileMarcacoesEstabelecimento
+||:web.WEB-INF.classes.db.entidades.EstadoMedida
+java.lang.Object
+java.io.Serializable
+web.WEB-INF.classes.db.entidades.EstadoMedida
 ||:db.data.siprp_local.inner.LembretesTipos
 com.evolute.entity.evo.EvoDataException
 java.lang.Boolean
@@ -7796,16 +7800,12 @@ java.lang.String
 java.lang.RuntimeException
 java.lang.Integer
 java.lang.Exception
-||:web.WEB-INF.classes.db.entidades.EstadoMedida
-java.lang.Object
-java.io.Serializable
-web.WEB-INF.classes.db.entidades.EstadoMedida
-||:web.WEB-INF.classes.db.data.siprp_local.outer.HsMedidaData
-db.data.siprp_local.inner.HsMedida
-web.WEB-INF.classes.db.data.siprp_local.outer.HsMedidaData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.HsRiscoData
 web.WEB-INF.classes.db.data.siprp_local.outer.HsRiscoData
 db.data.siprp_local.inner.HsRisco
+||:web.WEB-INF.classes.db.data.siprp_local.outer.HsMedidaData
+db.data.siprp_local.inner.HsMedida
+web.WEB-INF.classes.db.data.siprp_local.outer.HsMedidaData
 ||:web.WEB-INF.classes.planosactuacao.ViewPlano$1
 java.lang.Object
 web.WEB-INF.classes.planosactuacao.ViewPlano$1
@@ -7841,6 +7841,9 @@ java.lang.Object
 java.lang.String
 planosactuacao.SessionBean1
 pagination.Pagination
+||:tabledataproviders.PlanosConcluidosDataProvider
+com.sun.data.provider.impl.ObjectListDataProvider
+tabledataproviders.PlanosConcluidosDataProvider
 ||:db.data.siprp_local.inner.HsEmail
 java.lang.System
 java.util.LinkedList
@@ -7862,9 +7865,6 @@ db.data.siprp_local.outer.HsEmailEmpresaData
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:tabledataproviders.PlanosConcluidosDataProvider
-com.sun.data.provider.impl.ObjectListDataProvider
-tabledataproviders.PlanosConcluidosDataProvider
 ||:web.WEB-INF.classes.db.data.siprp.outer.ErrorsData
 web.WEB-INF.classes.db.data.siprp.outer.ErrorsData
 db.data.siprp.inner.Errors
@@ -7894,9 +7894,6 @@ java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp.outer.RecomendacoesData
-db.data.siprp.inner.Recomendacoes
-web.WEB-INF.classes.db.data.siprp.outer.RecomendacoesData
 ||:web.WEB-INF.classes.planosactuacao.ViewPlano
 db.entidades.PostoTrabalho
 java.util.ArrayList
@@ -7934,12 +7931,15 @@ com.sun.webui.jsf.component.StaticText
 db.providers.RiscoLogic
 db.providers.PlanosDataProvider
 com.evolute.utils.error.ErrorLogger
-||:db.data.siprp_local.outer.MarcacoesEstabelecimentoData
-db.data.siprp_local.inner.MarcacoesEstabelecimento
-db.data.siprp_local.outer.MarcacoesEstabelecimentoData
+||:web.WEB-INF.classes.db.data.siprp.outer.RecomendacoesData
+db.data.siprp.inner.Recomendacoes
+web.WEB-INF.classes.db.data.siprp.outer.RecomendacoesData
 ||:db.data.siprp_local.outer.HsRelatorioNormalizacaoData
 db.data.siprp_local.outer.HsRelatorioNormalizacaoData
 db.data.siprp_local.inner.HsRelatorioNormalizacao
+||:db.data.siprp_local.outer.MarcacoesEstabelecimentoData
+db.data.siprp_local.inner.MarcacoesEstabelecimento
+db.data.siprp_local.outer.MarcacoesEstabelecimentoData
 ||:db.data.siprp_local.inner.TrabalhadoresEcdsDatasObservacoes
 com.evolute.entity.evo.EvoDataException
 java.lang.Boolean
@@ -7979,12 +7979,12 @@ java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.outer.CurHospitaisData
-db.data.siprp_local.inner.CurHospitais
-web.WEB-INF.classes.db.data.siprp_local.outer.CurHospitaisData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.TrabalhadoresConsultasData
 web.WEB-INF.classes.db.data.siprp_local.outer.TrabalhadoresConsultasData
 db.data.siprp_local.inner.TrabalhadoresConsultas
+||:web.WEB-INF.classes.db.data.siprp_local.outer.CurHospitaisData
+db.data.siprp_local.inner.CurHospitais
+web.WEB-INF.classes.db.data.siprp_local.outer.CurHospitaisData
 ||:db.data.siprp_local.outer.HsEmailEmpresaData
 db.data.siprp_local.inner.HsEmailEmpresa
 db.data.siprp_local.outer.HsEmailEmpresaData
@@ -8071,15 +8071,12 @@ java.lang.String
 ||:web.WEB-INF.classes.db.data.siprp.outer.PlanoPostosTrabalhoData
 web.WEB-INF.classes.db.data.siprp.outer.PlanoPostosTrabalhoData
 db.data.siprp.inner.PlanoPostosTrabalho
-||:web.WEB-INF.classes.db.data.siprp_local.outer.PrestadoresGruposProtocoloData
-web.WEB-INF.classes.db.data.siprp_local.outer.PrestadoresGruposProtocoloData
-db.data.siprp_local.inner.PrestadoresGruposProtocolo
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData
 web.WEB-INF.classes.db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData
 db.data.siprp_local.inner.FilFileMarcacoesEstabelecimento
-||:db.data.siprp_local.outer.EtiquetasData
-db.data.siprp_local.inner.Etiquetas
-db.data.siprp_local.outer.EtiquetasData
+||:web.WEB-INF.classes.db.data.siprp_local.outer.PrestadoresGruposProtocoloData
+web.WEB-INF.classes.db.data.siprp_local.outer.PrestadoresGruposProtocoloData
+db.data.siprp_local.inner.PrestadoresGruposProtocolo
 ||:db.data.siprp.inner.MarcacoesEstabelecimento
 com.evolute.entity.evo.EvoDataException
 db.data.siprp.inner.MarcacoesEstabelecimento
@@ -8096,6 +8093,12 @@ java.util.Date
 java.lang.RuntimeException
 java.lang.Integer
 java.lang.Exception
+||:db.data.siprp_local.outer.EtiquetasData
+db.data.siprp_local.inner.Etiquetas
+db.data.siprp_local.outer.EtiquetasData
+||:web.WEB-INF.classes.db.data.siprp_local.outer.EvoUsrPermissionData
+db.data.siprp_local.inner.EvoUsrPermission
+web.WEB-INF.classes.db.data.siprp_local.outer.EvoUsrPermissionData
 ||:web.WEB-INF.classes.db.data.siprp.inner.Exames
 java.lang.System
 com.evolute.entity.ForeignKey
@@ -8117,9 +8120,6 @@ java.lang.Object
 web.WEB-INF.classes.db.data.siprp.inner.Exames
 java.lang.String
 db.data.siprp.outer.MedicosData
-||:web.WEB-INF.classes.db.data.siprp_local.outer.EvoUsrPermissionData
-db.data.siprp_local.inner.EvoUsrPermission
-web.WEB-INF.classes.db.data.siprp_local.outer.EvoUsrPermissionData
 ||:web.WEB-INF.classes.planosactuacao.ListaPlanos
 java.util.LinkedList
 javax.servlet.ServletOutputStream
@@ -8167,9 +8167,6 @@ javax.faces.context.ExternalContext
 java.util.Date
 db.providers.PlanosDataProvider
 com.evolute.utils.error.ErrorLogger
-||:db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData
-db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData
-db.data.siprp_local.inner.TrabalhadoresEcdsAnalise
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.TrabalhadoresConsultas
 java.lang.System
 com.evolute.entity.ForeignKey
@@ -8195,9 +8192,9 @@ db.data.siprp_local.outer.TrabalhadoresData
 db.data.siprp_local.outer.PrestadoresData
 java.lang.Object
 java.lang.String
-||:db.data.siprp_local.outer.IdsData
-db.data.siprp_local.inner.Ids
-db.data.siprp_local.outer.IdsData
+||:db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData
+db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData
+db.data.siprp_local.inner.TrabalhadoresEcdsAnalise
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.PrtGruposProtocolo
 web.WEB-INF.classes.db.data.siprp_local.inner.PrtGruposProtocolo
 java.lang.System
@@ -8223,12 +8220,15 @@ com.evolute.entity.evo.EvoDataObject
 db.data.siprp_local.outer.PrestadoresData
 java.lang.Object
 java.lang.String
-||:db.data.siprp.outer.PermissoesData
-db.data.siprp.inner.Permissoes
-db.data.siprp.outer.PermissoesData
+||:db.data.siprp_local.outer.IdsData
+db.data.siprp_local.inner.Ids
+db.data.siprp_local.outer.IdsData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.CurArsData
 db.data.siprp_local.inner.CurArs
 web.WEB-INF.classes.db.data.siprp_local.outer.CurArsData
+||:db.data.siprp.outer.PermissoesData
+db.data.siprp.inner.Permissoes
+db.data.siprp.outer.PermissoesData
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.HsRiscoMedida
 com.evolute.entity.evo.EvoDataException
 java.lang.Boolean
@@ -8386,9 +8386,6 @@ web.WEB-INF.classes.db.data.siprp.outer.SeccoesData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.AvisosData
 web.WEB-INF.classes.db.data.siprp_local.outer.AvisosData
 db.data.siprp_local.inner.Avisos
-||:db.data.siprp_local.outer.MarcacoesTrabalhadorData
-db.data.siprp_local.outer.MarcacoesTrabalhadorData
-db.data.siprp_local.inner.MarcacoesTrabalhador
 ||:web.WEB-INF.classes.planosactuacao.SessionBean1
 com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
@@ -8408,6 +8405,9 @@ tabledataproviders.PlanosSeguimentoDataProvider
 java.lang.Exception
 planosactuacao.SessionBean1$PAGINATION_ENUM
 pagination.Pagination
+||:db.data.siprp_local.outer.MarcacoesTrabalhadorData
+db.data.siprp_local.outer.MarcacoesTrabalhadorData
+db.data.siprp_local.inner.MarcacoesTrabalhador
 ||:db.data.siprp.outer.AcidentadosData
 db.data.siprp.outer.AcidentadosData
 db.data.siprp.inner.Acidentados
@@ -8435,12 +8435,12 @@ java.lang.String
 java.lang.Object
 java.io.Serializable
 db.entidades.Risco
-||:db.data.siprp_local.outer.CurNumeroCertificadoData
-db.data.siprp_local.inner.CurNumeroCertificado
-db.data.siprp_local.outer.CurNumeroCertificadoData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioPostoMedidaData
 web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioPostoMedidaData
 db.data.siprp_local.inner.HsRelatorioPostoMedida
+||:db.data.siprp_local.outer.CurNumeroCertificadoData
+db.data.siprp_local.inner.CurNumeroCertificado
+db.data.siprp_local.outer.CurNumeroCertificadoData
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.EvoPessoa
 java.lang.System
 java.util.LinkedList
@@ -8480,10 +8480,8 @@ db.data.siprp_local.outer.TrabalhadoresConsultasData
 db.data.siprp_local.inner.TrabalhadoresConsultas
 ||:utils.PlanosActuacaoLogger
 java.lang.Object
-com.evolute.utils.error.ErrorLogger
 utils.PlanosActuacaoLogger
 java.util.HashMap
-com.evolute.utils.error.ws.WSLogger
 com.evolute.utils.error.ProjectsEnum
 java.lang.Exception
 com.evolute.utils.error.LoggerProperties
@@ -8542,12 +8540,12 @@ java.lang.String
 java.lang.RuntimeException
 java.lang.Integer
 java.lang.Exception
-||:web.WEB-INF.classes.db.data.siprp_local.outer.CurFormadoresData
-db.data.siprp_local.inner.CurFormadores
-web.WEB-INF.classes.db.data.siprp_local.outer.CurFormadoresData
 ||:db.data.siprp_local.outer.FilCategoriasData
 db.data.siprp_local.outer.FilCategoriasData
 db.data.siprp_local.inner.FilCategorias
+||:web.WEB-INF.classes.db.data.siprp_local.outer.CurFormadoresData
+db.data.siprp_local.inner.CurFormadores
+web.WEB-INF.classes.db.data.siprp_local.outer.CurFormadoresData
 ||:db.data.siprp.inner.MarcacoesEmpresa
 com.evolute.entity.evo.EvoDataException
 db.data.siprp.outer.EmpresasData
@@ -8610,22 +8608,23 @@ java.lang.RuntimeException
 java.lang.Integer
 java.lang.String
 java.lang.Exception
-||:db.data.siprp.inner.Medidas
-java.lang.Number
+||:web.WEB-INF.classes.db.data.siprp_local.inner.CurPresencas
 java.lang.System
 com.evolute.entity.ForeignKey
-db.data.siprp.inner.Medidas
 java.lang.Class
-db.data.siprp.outer.AnalisesAcidentesData
 com.evolute.entity.evo.EvoDataException
 com.evolute.utils.arrays.Virtual2DArray
-java.lang.ClassCastException
+db.data.siprp_local.outer.CurFormandosData
 java.lang.Long
+java.sql.Timestamp
+db.data.siprp_local.outer.CurCursosData
 java.lang.Boolean
+db.data.siprp_local.outer.CurFormadoresData
 java.lang.RuntimeException
 com.evolute.entity.utils.IntegerPrimaryKey
 java.util.HashMap
 java.lang.Exception
+web.WEB-INF.classes.db.data.siprp_local.inner.CurPresencas
 java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
@@ -8658,23 +8657,22 @@ db.data.siprp_local.outer.TrabalhadoresData
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.inner.CurPresencas
+||:db.data.siprp.inner.Medidas
+java.lang.Number
 java.lang.System
 com.evolute.entity.ForeignKey
+db.data.siprp.inner.Medidas
 java.lang.Class
+db.data.siprp.outer.AnalisesAcidentesData
 com.evolute.entity.evo.EvoDataException
 com.evolute.utils.arrays.Virtual2DArray
-db.data.siprp_local.outer.CurFormandosData
+java.lang.ClassCastException
 java.lang.Long
-java.sql.Timestamp
-db.data.siprp_local.outer.CurCursosData
 java.lang.Boolean
-db.data.siprp_local.outer.CurFormadoresData
 java.lang.RuntimeException
 com.evolute.entity.utils.IntegerPrimaryKey
 java.util.HashMap
 java.lang.Exception
-web.WEB-INF.classes.db.data.siprp_local.inner.CurPresencas
 java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
@@ -8698,9 +8696,30 @@ java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:db.data.siprp_local.outer.PrtElementosProtocoloData
-db.data.siprp_local.outer.PrtElementosProtocoloData
-db.data.siprp_local.inner.PrtElementosProtocolo
+||:web.WEB-INF.classes.planosactuacao.Estatistica
+java.lang.StringBuilder
+java.lang.System
+planosactuacao.EditarPlano
+java.util.ArrayList
+com.sun.webui.jsf.component.TableRowGroup
+java.util.List
+web.WEB-INF.classes.planosactuacao.Estatistica
+java.io.PrintStream
+db.providers.PlanosDataProvider
+tabledataproviders.EstatisticaPlanoDataProvider
+com.sun.webui.jsf.component.Table
+com.evolute.utils.data.Mappable
+planosactuacao.ApplicationBean1
+[Lcom.sun.webui.jsf.model.Option;
+com.sun.rave.web.ui.appbase.AbstractPageBean
+com.sun.webui.jsf.model.Option
+javax.faces.FacesException
+java.lang.Exception
+java.lang.Integer
+planosactuacao.RequestBean1
+com.sun.webui.jsf.component.DropDown
+planosactuacao.SessionBean1
+java.lang.String
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.MarcacoesTrabalhador
 java.lang.System
 db.data.siprp_local.outer.MarcacoesGruposRealizadosData
@@ -8728,30 +8747,9 @@ com.evolute.entity.evo.EvoDataObject
 db.data.siprp_local.outer.PrestadoresData
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.planosactuacao.Estatistica
-java.lang.StringBuilder
-java.lang.System
-planosactuacao.EditarPlano
-java.util.ArrayList
-com.sun.webui.jsf.component.TableRowGroup
-java.util.List
-web.WEB-INF.classes.planosactuacao.Estatistica
-java.io.PrintStream
-db.providers.PlanosDataProvider
-tabledataproviders.EstatisticaPlanoDataProvider
-com.sun.webui.jsf.component.Table
-com.evolute.utils.data.Mappable
-planosactuacao.ApplicationBean1
-[Lcom.sun.webui.jsf.model.Option;
-com.sun.rave.web.ui.appbase.AbstractPageBean
-com.sun.webui.jsf.model.Option
-javax.faces.FacesException
-java.lang.Exception
-java.lang.Integer
-planosactuacao.RequestBean1
-com.sun.webui.jsf.component.DropDown
-planosactuacao.SessionBean1
-java.lang.String
+||:db.data.siprp_local.outer.PrtElementosProtocoloData
+db.data.siprp_local.outer.PrtElementosProtocoloData
+db.data.siprp_local.inner.PrtElementosProtocolo
 ||:db.data.siprp_local.inner.CurFormadores
 db.data.siprp_local.inner.CurFormadores
 java.lang.System
@@ -8854,64 +8852,53 @@ com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 db.data.siprp.outer.DepartamentosData
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.inner.FilFileAppointment
+||:web.WEB-INF.classes.db.data.siprp_local.inner.Exames
+db.data.siprp_local.outer.MedicosData
 java.lang.System
 com.evolute.entity.ForeignKey
+java.util.LinkedList
+com.evolute.entity.evo.EvoDataProvider
+db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData
 java.lang.Class
+java.util.List
 com.evolute.entity.evo.EvoDataException
-web.WEB-INF.classes.db.data.siprp_local.inner.FilFileAppointment
+java.util.Date
 com.evolute.utils.arrays.Virtual2DArray
+db.data.siprp_local.outer.LembretesData
+java.util.Map
 java.lang.Long
+java.sql.Timestamp
 java.lang.Boolean
+[B
 java.lang.RuntimeException
 com.evolute.entity.utils.IntegerPrimaryKey
+web.WEB-INF.classes.db.data.siprp_local.inner.Exames
 java.util.HashMap
 java.lang.Exception
 java.lang.Integer
+db.data.siprp_local.outer.TrabalhadoresData
 com.evolute.entity.evo.EvoDataObject
-db.data.siprp_local.outer.FilFileData
-db.data.siprp_local.outer.AptAppointmentData
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.inner.Exames
-db.data.siprp_local.outer.MedicosData
+||:web.WEB-INF.classes.db.data.siprp_local.inner.FilFileAppointment
 java.lang.System
 com.evolute.entity.ForeignKey
-java.util.LinkedList
-com.evolute.entity.evo.EvoDataProvider
-db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData
 java.lang.Class
-java.util.List
 com.evolute.entity.evo.EvoDataException
-java.util.Date
+web.WEB-INF.classes.db.data.siprp_local.inner.FilFileAppointment
 com.evolute.utils.arrays.Virtual2DArray
-db.data.siprp_local.outer.LembretesData
-java.util.Map
 java.lang.Long
-java.sql.Timestamp
 java.lang.Boolean
-[B
 java.lang.RuntimeException
 com.evolute.entity.utils.IntegerPrimaryKey
-web.WEB-INF.classes.db.data.siprp_local.inner.Exames
 java.util.HashMap
 java.lang.Exception
 java.lang.Integer
-db.data.siprp_local.outer.TrabalhadoresData
 com.evolute.entity.evo.EvoDataObject
+db.data.siprp_local.outer.FilFileData
+db.data.siprp_local.outer.AptAppointmentData
 java.lang.Object
 java.lang.String
-||:pagination.PaginationPatrimoniais
-db.entidades.Risco
-java.lang.Boolean
-planosactuacao.SessionBean1
-java.util.List
-pagination.PaginationPatrimoniais
-db.entidades.Area
-db.entidades.PlanoActuacao
-java.util.Iterator
-pagination.Pagination
-planosactuacao.SessionBean1$PAGINATION_ENUM
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.Estabelecimentos
 db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData
 db.data.siprp_local.outer.MedicosData
@@ -8948,6 +8935,17 @@ com.evolute.entity.evo.EvoDataObject
 db.data.siprp_local.outer.PrestadoresData
 java.lang.Object
 java.lang.String
+||:pagination.PaginationPatrimoniais
+db.entidades.Risco
+java.lang.Boolean
+planosactuacao.SessionBean1
+java.util.List
+pagination.PaginationPatrimoniais
+db.entidades.Area
+db.entidades.PlanoActuacao
+java.util.Iterator
+pagination.Pagination
+planosactuacao.SessionBean1$PAGINATION_ENUM
 ||:web.WEB-INF.classes.db.data.siprp.inner.Recomendacoes
 java.lang.Number
 java.lang.System
@@ -8968,9 +8966,16 @@ web.WEB-INF.classes.db.data.siprp.inner.Recomendacoes
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioRiscoData
-web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioRiscoData
-db.data.siprp_local.inner.HsRelatorioRisco
+||:web.WEB-INF.classes.db.entidades.Area
+java.lang.Object
+java.io.Serializable
+web.WEB-INF.classes.db.entidades.Area
+java.lang.Boolean
+java.lang.Integer
+java.lang.Comparable
+||:web.WEB-INF.classes.db.data.siprp_local.outer.FilCategoriasData
+db.data.siprp_local.inner.FilCategorias
+web.WEB-INF.classes.db.data.siprp_local.outer.FilCategoriasData
 ||:db.data.siprp_local.inner.FilFileEmpresa
 db.data.siprp_local.inner.FilFileEmpresa
 java.lang.System
@@ -8991,19 +8996,23 @@ com.evolute.entity.evo.EvoDataObject
 db.data.siprp_local.outer.FilFileData
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.outer.FilCategoriasData
-db.data.siprp_local.inner.FilCategorias
-web.WEB-INF.classes.db.data.siprp_local.outer.FilCategoriasData
-||:web.WEB-INF.classes.db.entidades.Area
-java.lang.Object
-java.io.Serializable
-web.WEB-INF.classes.db.entidades.Area
-java.lang.Boolean
-java.lang.Integer
-java.lang.Comparable
+||:web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioRiscoData
+web.WEB-INF.classes.db.data.siprp_local.outer.HsRelatorioRiscoData
+db.data.siprp_local.inner.HsRelatorioRisco
 ||:db.data.siprp_local.outer.FilFileEmpresaData
 db.data.siprp_local.inner.FilFileEmpresa
 db.data.siprp_local.outer.FilFileEmpresaData
+||:web.WEB-INF.classes.planosactuacao.RequestBean1
+web.WEB-INF.classes.planosactuacao.RequestBean1
+com.evolute.utils.error.ErrorLogger
+com.sun.rave.web.ui.appbase.AbstractRequestBean
+javax.faces.FacesException
+java.lang.Exception
+planosactuacao.SessionBean1
+planosactuacao.ApplicationBean1
+||:db.data.siprp_local.outer.HsRelatorioPostoMedidaData
+db.data.siprp_local.outer.HsRelatorioPostoMedidaData
+db.data.siprp_local.inner.HsRelatorioPostoMedida
 ||:web.WEB-INF.classes.db.data.siprp.inner.Properties
 com.evolute.entity.utils.ObjectPrimaryKey
 java.lang.String
@@ -9013,17 +9022,6 @@ com.evolute.entity.evo.EvoDataObject
 java.util.HashMap
 java.lang.Boolean
 java.lang.Integer
-||:db.data.siprp_local.outer.HsRelatorioPostoMedidaData
-db.data.siprp_local.outer.HsRelatorioPostoMedidaData
-db.data.siprp_local.inner.HsRelatorioPostoMedida
-||:web.WEB-INF.classes.planosactuacao.RequestBean1
-web.WEB-INF.classes.planosactuacao.RequestBean1
-com.evolute.utils.error.ErrorLogger
-com.sun.rave.web.ui.appbase.AbstractRequestBean
-javax.faces.FacesException
-java.lang.Exception
-planosactuacao.SessionBean1
-planosactuacao.ApplicationBean1
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.Contactos
 java.lang.System
 java.util.LinkedList
@@ -9146,43 +9144,43 @@ java.lang.RuntimeException
 java.lang.Integer
 java.lang.String
 java.lang.Exception
-||:web.WEB-INF.classes.db.data.siprp_local.inner.CurHospitais
+||:web.WEB-INF.classes.db.data.siprp_local.inner.AptSegurancaAlimentar
 java.lang.System
-java.util.LinkedList
+com.evolute.entity.ForeignKey
 java.lang.Class
-java.util.List
 com.evolute.entity.evo.EvoDataException
-db.data.siprp_local.outer.CurFormandosData
-java.util.Map
+com.evolute.utils.arrays.Virtual2DArray
 java.lang.Long
+java.sql.Timestamp
+web.WEB-INF.classes.db.data.siprp_local.inner.AptSegurancaAlimentar
 java.lang.Boolean
 java.lang.RuntimeException
 com.evolute.entity.utils.IntegerPrimaryKey
-web.WEB-INF.classes.db.data.siprp_local.inner.CurHospitais
+db.data.siprp_local.outer.EstabelecimentosData
 java.util.HashMap
 java.lang.Exception
 java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
+db.data.siprp_local.outer.AptAppointmentData
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.inner.AptSegurancaAlimentar
+||:web.WEB-INF.classes.db.data.siprp_local.inner.CurHospitais
 java.lang.System
-com.evolute.entity.ForeignKey
+java.util.LinkedList
 java.lang.Class
+java.util.List
 com.evolute.entity.evo.EvoDataException
-com.evolute.utils.arrays.Virtual2DArray
+db.data.siprp_local.outer.CurFormandosData
+java.util.Map
 java.lang.Long
-java.sql.Timestamp
-web.WEB-INF.classes.db.data.siprp_local.inner.AptSegurancaAlimentar
 java.lang.Boolean
 java.lang.RuntimeException
 com.evolute.entity.utils.IntegerPrimaryKey
-db.data.siprp_local.outer.EstabelecimentosData
+web.WEB-INF.classes.db.data.siprp_local.inner.CurHospitais
 java.util.HashMap
 java.lang.Exception
 java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
-db.data.siprp_local.outer.AptAppointmentData
 java.lang.Object
 java.lang.String
 ||:web.WEB-INF.classes.db.data.siprp.outer.PlanoRiscosData
@@ -9255,9 +9253,6 @@ db.data.siprp_local.inner.Errors
 ||:db.data.siprp_local.outer.EcdOficialData
 db.data.siprp_local.outer.EcdOficialData
 db.data.siprp_local.inner.EcdOficial
-||:db.data.siprp_local.outer.TrabalhadoresEcdsData
-db.data.siprp_local.inner.TrabalhadoresEcds
-db.data.siprp_local.outer.TrabalhadoresEcdsData
 ||:db.providers.RelatoriosDataProvider
 com.evolute.utils.error.ErrorLogger
 java.lang.StringBuilder
@@ -9284,6 +9279,9 @@ java.lang.Integer
 utils.Utils
 java.lang.Object
 java.lang.String
+||:db.data.siprp_local.outer.TrabalhadoresEcdsData
+db.data.siprp_local.inner.TrabalhadoresEcds
+db.data.siprp_local.outer.TrabalhadoresEcdsData
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.MarcacoesEmpresaData
 db.data.siprp_local.inner.MarcacoesEmpresa
 web.WEB-INF.classes.db.data.siprp_local.outer.MarcacoesEmpresaData
@@ -9339,6 +9337,24 @@ java.lang.String
 ||:web.WEB-INF.classes.db.data.siprp_local.outer.CurQuestionarioPerguntaData
 db.data.siprp_local.inner.CurQuestionarioPergunta
 web.WEB-INF.classes.db.data.siprp_local.outer.CurQuestionarioPerguntaData
+||:web.WEB-INF.classes.db.data.siprp_local.inner.HsRiscoEmpresa
+com.evolute.entity.evo.EvoDataException
+java.lang.Boolean
+com.evolute.entity.utils.IntegerPrimaryKey
+web.WEB-INF.classes.db.data.siprp_local.inner.HsRiscoEmpresa
+db.data.siprp_local.outer.HsRiscoData
+com.evolute.entity.ForeignKey
+java.lang.Class
+db.data.siprp_local.outer.EmpresasData
+java.lang.System
+java.util.HashMap
+java.lang.Long
+com.evolute.entity.evo.EvoDataObject
+java.lang.Object
+java.lang.RuntimeException
+java.lang.Integer
+java.lang.String
+java.lang.Exception
 ||:web.WEB-INF.classes.db.data.siprp.inner.Departamentos
 java.lang.Number
 db.data.siprp.outer.SeccoesData
@@ -9362,24 +9378,6 @@ java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
-||:web.WEB-INF.classes.db.data.siprp_local.inner.HsRiscoEmpresa
-com.evolute.entity.evo.EvoDataException
-java.lang.Boolean
-com.evolute.entity.utils.IntegerPrimaryKey
-web.WEB-INF.classes.db.data.siprp_local.inner.HsRiscoEmpresa
-db.data.siprp_local.outer.HsRiscoData
-com.evolute.entity.ForeignKey
-java.lang.Class
-db.data.siprp_local.outer.EmpresasData
-java.lang.System
-java.util.HashMap
-java.lang.Long
-com.evolute.entity.evo.EvoDataObject
-java.lang.Object
-java.lang.RuntimeException
-java.lang.Integer
-java.lang.String
-java.lang.Exception
 ||:web.WEB-INF.classes.db.data.siprp_local.inner.TrabalhadoresConsultasDatasObservacoes
 com.evolute.entity.evo.EvoDataException
 java.lang.Boolean
@@ -9407,23 +9405,15 @@ java.util.HashMap
 java.lang.Boolean
 web.WEB-INF.classes.db.data.siprp.inner.RiscoValoresTemp
 java.lang.Integer
+||:web.WEB-INF.classes.db.data.siprp_local.outer.ContactosData
+web.WEB-INF.classes.db.data.siprp_local.outer.ContactosData
+db.data.siprp_local.inner.Contactos
 ||:db.providers.PlanosDataProvider$2
 java.lang.Object
 db.providers.PlanosDataProvider
 db.providers.PlanosDataProvider$2
 java.lang.NoSuchFieldError
 db.providers.PlanosDataProvider$SECTION
-||:web.WEB-INF.classes.db.data.siprp_local.outer.ContactosData
-web.WEB-INF.classes.db.data.siprp_local.outer.ContactosData
-db.data.siprp_local.inner.Contactos
-||:db.providers.PlanosDataProvider$1
-java.lang.Object
-java.lang.String
-db.providers.PlanosDataProvider
-db.providers.PlanosDataProvider$1
-java.util.Comparator
-java.lang.Integer
-db.entidades.Risco
 ||:db.data.siprp.inner.EstadoMedidas
 java.lang.Number
 java.lang.System
@@ -9446,6 +9436,14 @@ java.lang.Integer
 com.evolute.entity.evo.EvoDataObject
 java.lang.Object
 java.lang.String
+||:db.providers.PlanosDataProvider$1
+java.lang.Object
+java.lang.String
+db.providers.PlanosDataProvider
+db.providers.PlanosDataProvider$1
+java.util.Comparator
+java.lang.Integer
+db.entidades.Risco
 ||:db.data.siprp_local.inner.AptAppointment
 db.data.siprp_local.outer.AptStateData
 java.lang.System
@@ -9483,15 +9481,34 @@ com.evolute.entity.evo.EvoDataObject
 java.util.HashMap
 java.lang.Boolean
 java.lang.Integer
-||:web.WEB-INF.classes.db.data.siprp.outer.TrabalhadoresData
-db.data.siprp.inner.Trabalhadores
-web.WEB-INF.classes.db.data.siprp.outer.TrabalhadoresData
 ||:db.data.siprp_local.outer.AptOutrasVacinaData
 db.data.siprp_local.inner.AptOutrasVacina
 db.data.siprp_local.outer.AptOutrasVacinaData
-||:web.WEB-INF.classes.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData
-db.data.siprp_local.inner.HsLegislacaoEstabelecimento
-web.WEB-INF.classes.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData
+||:web.WEB-INF.classes.db.data.siprp.outer.TrabalhadoresData
+db.data.siprp.inner.Trabalhadores
+web.WEB-INF.classes.db.data.siprp.outer.TrabalhadoresData
+||:web.WEB-INF.classes.db.data.siprp_local.inner.CurQuestionarioPergunta
+java.lang.System
+com.evolute.entity.ForeignKey
+db.data.siprp_local.outer.CurQuestionarioData
+java.util.LinkedList
+web.WEB-INF.classes.db.data.siprp_local.inner.CurQuestionarioPergunta
+java.lang.Class
+java.util.List
+com.evolute.entity.evo.EvoDataException
+com.evolute.utils.arrays.Virtual2DArray
+java.util.Map
+java.lang.Long
+java.lang.Boolean
+java.lang.RuntimeException
+com.evolute.entity.utils.IntegerPrimaryKey
+java.util.HashMap
+db.data.siprp_local.outer.CurQuestionarioRespostaData
+java.lang.Exception
+java.lang.Integer
+com.evolute.entity.evo.EvoDataObject
+java.lang.Object
+java.lang.String
 ||:web.WEB-INF.classes.updates.updates.FixPlanoImportedUnicode
 db.data.siprp_local.outer.HsRelatorioRiscoData
 web.WEB-INF.classes.updates.updates.FixPlanoImportedUnicode
@@ -9524,28 +9541,9 @@ java.lang.String
 com.evolute.module.updater.AbstractUpdate
 java.util.Set
 db.providers.EvoBaseProvider
-||:web.WEB-INF.classes.db.data.siprp_local.inner.CurQuestionarioPergunta
-java.lang.System
-com.evolute.entity.ForeignKey
-db.data.siprp_local.outer.CurQuestionarioData
-java.util.LinkedList
-web.WEB-INF.classes.db.data.siprp_local.inner.CurQuestionarioPergunta
-java.lang.Class
-java.util.List
-com.evolute.entity.evo.EvoDataException
-com.evolute.utils.arrays.Virtual2DArray
-java.util.Map
-java.lang.Long
-java.lang.Boolean
-java.lang.RuntimeException
-com.evolute.entity.utils.IntegerPrimaryKey
-java.util.HashMap
-db.data.siprp_local.outer.CurQuestionarioRespostaData
-java.lang.Exception
-java.lang.Integer
-com.evolute.entity.evo.EvoDataObject
-java.lang.Object
-java.lang.String
+||:web.WEB-INF.classes.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData
+db.data.siprp_local.inner.HsLegislacaoEstabelecimento
+web.WEB-INF.classes.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData
 ||:db.data.siprp_local.inner.HsNormalizacaoEstabelecimento
 com.evolute.entity.evo.EvoDataException
 java.lang.Boolean
diff --git a/trunk/PlanosActuacao/deploy/lib/activation.jar b/trunk/PlanosActuacao/deploy/lib/activation.jar
deleted file mode 100644
index 589b6749..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/activation.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/appbase.jar b/trunk/PlanosActuacao/deploy/lib/appbase.jar
deleted file mode 100644
index cfca6d0a..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/appbase.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/ashwood-2.0.jar b/trunk/PlanosActuacao/deploy/lib/ashwood-2.0.jar
deleted file mode 100644
index 55fcc9b1..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/ashwood-2.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/avalon-framework-4.2.0.jar b/trunk/PlanosActuacao/deploy/lib/avalon-framework-4.2.0.jar
deleted file mode 100644
index b1aa6d7c..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/avalon-framework-4.2.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/batik-all-1.7.jar b/trunk/PlanosActuacao/deploy/lib/batik-all-1.7.jar
deleted file mode 100644
index 58932858..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/batik-all-1.7.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-beanutils-1.8.3.jar b/trunk/PlanosActuacao/deploy/lib/commons-beanutils-1.8.3.jar
deleted file mode 100644
index 218510bc..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-beanutils-1.8.3.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-codec-1.3.jar b/trunk/PlanosActuacao/deploy/lib/commons-codec-1.3.jar
deleted file mode 100644
index 957b6752..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-codec-1.3.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-collections-3.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-collections-3.1.jar
deleted file mode 100644
index 41e230fe..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-collections-3.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-digester-1.8.jar b/trunk/PlanosActuacao/deploy/lib/commons-digester-1.8.jar
deleted file mode 100644
index 1110f0aa..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-digester-1.8.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-fileupload-1.2.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-fileupload-1.2.1.jar
deleted file mode 100644
index 7db423ed..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-fileupload-1.2.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-httpclient-3.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-httpclient-3.1.jar
deleted file mode 100644
index 7c59774a..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-httpclient-3.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-io-1.4.jar b/trunk/PlanosActuacao/deploy/lib/commons-io-1.4.jar
deleted file mode 100644
index 133dc6cb..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-io-1.4.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-lang-2.4.jar b/trunk/PlanosActuacao/deploy/lib/commons-lang-2.4.jar
deleted file mode 100644
index 532939ec..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-lang-2.4.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-logging-1.1.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef144..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/commons-validator-1.3.1.jar b/trunk/PlanosActuacao/deploy/lib/commons-validator-1.3.1.jar
deleted file mode 100644
index 55b12b1a..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/commons-validator-1.3.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/cursos.jar b/trunk/PlanosActuacao/deploy/lib/cursos.jar
deleted file mode 100644
index b9c85e84..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/cursos.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/dataprovider.jar b/trunk/PlanosActuacao/deploy/lib/dataprovider.jar
deleted file mode 100644
index a12b68ad..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/dataprovider.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/dom4j-1.6.1.jar b/trunk/PlanosActuacao/deploy/lib/dom4j-1.6.1.jar
deleted file mode 100644
index c8c4dbb9..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/dom4j-1.6.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/evologger.jar b/trunk/PlanosActuacao/deploy/lib/evologger.jar
deleted file mode 100644
index 57a7cc5d..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/evologger.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/evolute.jar b/trunk/PlanosActuacao/deploy/lib/evolute.jar
deleted file mode 100644
index b0ef1483..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/evolute.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/fop.jar b/trunk/PlanosActuacao/deploy/lib/fop.jar
deleted file mode 100644
index 24419bcf..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/fop.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jai_imageio.jar b/trunk/PlanosActuacao/deploy/lib/jai_imageio.jar
deleted file mode 100644
index 359551eb..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jai_imageio.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jdbcappender.jar b/trunk/PlanosActuacao/deploy/lib/jdbcappender.jar
deleted file mode 100644
index fe9d3e67..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jdbcappender.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jdom.jar b/trunk/PlanosActuacao/deploy/lib/jdom.jar
deleted file mode 100644
index 288e64cb..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jdom.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-api.jar b/trunk/PlanosActuacao/deploy/lib/jsf-api.jar
deleted file mode 100644
index 7824f8a0..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jsf-api.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-extensions-common-0.1.jar b/trunk/PlanosActuacao/deploy/lib/jsf-extensions-common-0.1.jar
deleted file mode 100644
index e8766f33..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jsf-extensions-common-0.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-extensions-dynamic-faces-0.1.jar b/trunk/PlanosActuacao/deploy/lib/jsf-extensions-dynamic-faces-0.1.jar
deleted file mode 100644
index 4a5af1cd..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jsf-extensions-dynamic-faces-0.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsf-impl.jar b/trunk/PlanosActuacao/deploy/lib/jsf-impl.jar
deleted file mode 100644
index d656bdc3..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jsf-impl.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jsfcl.jar b/trunk/PlanosActuacao/deploy/lib/jsfcl.jar
deleted file mode 100644
index 524dc8af..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jsfcl.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/json-2.jar b/trunk/PlanosActuacao/deploy/lib/json-2.jar
deleted file mode 100644
index b89f579c..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/json-2.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/jstl.jar b/trunk/PlanosActuacao/deploy/lib/jstl.jar
deleted file mode 100644
index 0e64b5fb..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/jstl.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/log4j-1.2.15.jar b/trunk/PlanosActuacao/deploy/lib/log4j-1.2.15.jar
deleted file mode 100644
index c930a6ab..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/log4j-1.2.15.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/mail.jar b/trunk/PlanosActuacao/deploy/lib/mail.jar
deleted file mode 100644
index 59543774..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/mail.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/myfaces/commons-el-1.0.jar b/trunk/PlanosActuacao/deploy/lib/myfaces/commons-el-1.0.jar
deleted file mode 100644
index 608ed796..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/myfaces/commons-el-1.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/myfaces/tomahawk-1.1.10.jar b/trunk/PlanosActuacao/deploy/lib/myfaces/tomahawk-1.1.10.jar
deleted file mode 100644
index 36ef09f5..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/myfaces/tomahawk-1.1.10.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/myfaces/xmlParserAPIs-2.0.2.jar b/trunk/PlanosActuacao/deploy/lib/myfaces/xmlParserAPIs-2.0.2.jar
deleted file mode 100644
index eae78043..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/myfaces/xmlParserAPIs-2.0.2.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/org.springframework.beans-3.0.0.jar b/trunk/PlanosActuacao/deploy/lib/org.springframework.beans-3.0.0.jar
deleted file mode 100644
index 37b9abe7..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/org.springframework.beans-3.0.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/org.springframework.context-3.0.0.jar b/trunk/PlanosActuacao/deploy/lib/org.springframework.context-3.0.0.jar
deleted file mode 100644
index 7869adbb..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/org.springframework.context-3.0.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/org.springframework.core-3.0.0.jar b/trunk/PlanosActuacao/deploy/lib/org.springframework.core-3.0.0.jar
deleted file mode 100644
index 8f0134ee..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/org.springframework.core-3.0.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/postgresql-9.0-801.jdbc4.jar b/trunk/PlanosActuacao/deploy/lib/postgresql-9.0-801.jdbc4.jar
deleted file mode 100644
index 63e54165..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/postgresql-9.0-801.jdbc4.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-api-3.3.3.Final.jar b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-api-3.3.3.Final.jar
deleted file mode 100644
index 0aeb97a6..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-api-3.3.3.Final.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-impl-3.3.3.Final.jar b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-impl-3.3.3.Final.jar
deleted file mode 100644
index 6c61a7fd..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-impl-3.3.3.Final.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-ui-3.3.3.Final.jar b/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-ui-3.3.3.Final.jar
deleted file mode 100644
index 6b02e055..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/richfaces/richfaces-ui-3.3.3.Final.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/serializer-2.7.0.jar b/trunk/PlanosActuacao/deploy/lib/serializer-2.7.0.jar
deleted file mode 100644
index 7cd80696..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/serializer-2.7.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/shst.jar b/trunk/PlanosActuacao/deploy/lib/shst.jar
deleted file mode 100644
index 6b1cd8ac..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/shst.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-ws-core-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-ws-core-1.5.9.jar
deleted file mode 100644
index 8c944048..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/spring-ws-core-1.5.9.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-ws-core-tiger-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-ws-core-tiger-1.5.9.jar
deleted file mode 100644
index 8dabf02e..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/spring-ws-core-tiger-1.5.9.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-ws-support-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-ws-support-1.5.9.jar
deleted file mode 100644
index 82796229..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/spring-ws-support-1.5.9.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/spring-xml-1.5.9.jar b/trunk/PlanosActuacao/deploy/lib/spring-xml-1.5.9.jar
deleted file mode 100644
index 10a8905b..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/spring-xml-1.5.9.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/sqlx.jar b/trunk/PlanosActuacao/deploy/lib/sqlx.jar
deleted file mode 100644
index 2b341bb3..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/sqlx.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/standard.jar b/trunk/PlanosActuacao/deploy/lib/standard.jar
deleted file mode 100644
index ab559dd1..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/standard.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/truelicense.jar b/trunk/PlanosActuacao/deploy/lib/truelicense.jar
deleted file mode 100644
index 8c56bd12..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/truelicense.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/webui-jsf-suntheme.jar b/trunk/PlanosActuacao/deploy/lib/webui-jsf-suntheme.jar
deleted file mode 100644
index 8a69ce70..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/webui-jsf-suntheme.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/webui-jsf.jar b/trunk/PlanosActuacao/deploy/lib/webui-jsf.jar
deleted file mode 100644
index 9c939bbc..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/webui-jsf.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xalan-2.7.0.jar b/trunk/PlanosActuacao/deploy/lib/xalan-2.7.0.jar
deleted file mode 100644
index 979ee761..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/xalan-2.7.0.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xercesImpl-2.7.1.jar b/trunk/PlanosActuacao/deploy/lib/xercesImpl-2.7.1.jar
deleted file mode 100644
index eac75ae8..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/xercesImpl-2.7.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xml-apis-1.3.04.jar b/trunk/PlanosActuacao/deploy/lib/xml-apis-1.3.04.jar
deleted file mode 100644
index d42c0ea6..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/xml-apis-1.3.04.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xml-apis-ext-1.3.04.jar b/trunk/PlanosActuacao/deploy/lib/xml-apis-ext-1.3.04.jar
deleted file mode 100644
index a7869d68..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/xml-apis-ext-1.3.04.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/lib/xmlgraphics-commons-1.3.1.jar b/trunk/PlanosActuacao/deploy/lib/xmlgraphics-commons-1.3.1.jar
deleted file mode 100644
index 81a485dc..00000000
Binary files a/trunk/PlanosActuacao/deploy/lib/xmlgraphics-commons-1.3.1.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/deploy/siprp_planosactuacao_importer.jar b/trunk/PlanosActuacao/deploy/siprp_planosactuacao_importer.jar
deleted file mode 100644
index 1d2f724a..00000000
Binary files a/trunk/PlanosActuacao/deploy/siprp_planosactuacao_importer.jar and /dev/null differ
diff --git a/trunk/PlanosActuacao/src/importer/PlanosActuacaoImporter.java b/trunk/PlanosActuacao/src/importer/PlanosActuacaoImporter.java
index b3337fa1..f3acc0ff 100644
--- a/trunk/PlanosActuacao/src/importer/PlanosActuacaoImporter.java
+++ b/trunk/PlanosActuacao/src/importer/PlanosActuacaoImporter.java
@@ -60,8 +60,8 @@ public class PlanosActuacaoImporter
 
 	private static void readProperties( String[] args ) throws Exception
 	{
-//		args = new String[]{ "/home/fpalma/workspace/PlanosActuacao/properties/0-Importer/app.properties" };
-		args = new String[]{ "/Users/fpalma/Documents/workspace/PlanosActuacao/properties/0-Importer/app.properties" };
+		args = new String[]{ "/home/fpalma/workspace/PlanosActuacao/properties/0-Importer/app.properties" };
+//		args = new String[]{ "/Users/fpalma/Documents/workspace/PlanosActuacao/properties/0-Importer/app.properties" };
 
 		if ( args != null && args.length > 0 )
 		{