diff --git a/trunk/.classpath b/trunk/.classpath
index 07ffbb30..1cf4af03 100644
--- a/trunk/.classpath
+++ b/trunk/.classpath
@@ -42,5 +42,7 @@
 	<classpathentry kind="lib" path="SIPRPSoft/lib/fop.jar"/>
 	<classpathentry kind="lib" path="common/lib/ashwood-2.0.jar"/>
 	<classpathentry kind="lib" path="common/lib/cayenne-server-3.0M6.jar"/>
+	<classpathentry kind="lib" path="SIPRPSoft/lib/evospellchecker.jar"/>
+	<classpathentry kind="lib" path="SIPRPSoft/lib/jazzy-core.jar"/>
 	<classpathentry kind="output" path="SIPRPSoft/build/classes"/>
 </classpath>
diff --git a/trunk/SIPRPSoft/lib/evospellchecker.jar b/trunk/SIPRPSoft/lib/evospellchecker.jar
index 3c254eb4..919438cf 100644
Binary files a/trunk/SIPRPSoft/lib/evospellchecker.jar and b/trunk/SIPRPSoft/lib/evospellchecker.jar differ
diff --git a/trunk/SIPRPSoft/src/siprp/Main.java b/trunk/SIPRPSoft/src/siprp/Main.java
index f0fa4cc4..9fc1dca6 100644
--- a/trunk/SIPRPSoft/src/siprp/Main.java
+++ b/trunk/SIPRPSoft/src/siprp/Main.java
@@ -43,7 +43,6 @@ import siprp.data.TrabalhadorData;
 import siprp.lembretes.LembretesDemon;
 import siprp.update.UpdateWindow;
 
-import com.evolute.utils.EVUtilsImageLib;
 import com.evolute.utils.Singleton;
 import com.evolute.utils.db.DBException;
 import com.evolute.utils.db.DBManager;
@@ -63,8 +62,6 @@ public class Main implements com.evolute.utils.ui.window.Connector
 {
 	public final static String SHST_VERSION = "11.9.2";
 	
-	private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader();
-	
 	private static String dbase;
 	private SIPRPTracker siprpTracker;
 	private static LoginWindow loginWindow;
diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
index 9dde2714..87d8fc11 100644
--- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
+++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
@@ -93,12 +93,12 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
-		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
-		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
@@ -107,7 +107,6 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
-//	
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
@@ -136,19 +135,20 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
-//		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "ws-fpalma.redeapdp:5432" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
-//		
+		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
+		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL, "ws-fpalma.redeapdp:5432" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
+		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_URL, "192.168.1.1:5432" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
+		
 	}
 	
 }
diff --git a/trunk/common/src/siprp/SpellChecker.java b/trunk/common/src/siprp/SpellChecker.java
index 5d134eb5..79c70df9 100644
--- a/trunk/common/src/siprp/SpellChecker.java
+++ b/trunk/common/src/siprp/SpellChecker.java
@@ -2,17 +2,20 @@ package siprp;
 
 import javax.swing.text.JTextComponent;
 
+import com.evolute.modules.spellchecker.EvoSpellChecker;
+import com.evolute.modules.spellchecker.EvoSpellChecker.Dictionary;
+
 
 public class SpellChecker
 {
 	
 	private static SpellChecker instance = null;
 	
-//	private final EvoSpellChecker spellChecker;
+	private final EvoSpellChecker spellChecker;
 	
 	private SpellChecker()
 	{
-//		this.spellChecker = new EvoSpellChecker( Dictionary.PT_PT );
+		this.spellChecker = new EvoSpellChecker( Dictionary.PT_PT );
 	}
 	
 	public static SpellChecker getInstance()
@@ -24,10 +27,9 @@ public class SpellChecker
 		return instance;
 	}
 
-	public void attachSpellCheckToComponent( JTextComponent fieldTextMedida )
+	public void attachSpellCheckToComponent( JTextComponent fieldText )
 	{
-		// TODO Auto-generated method stub
-//		spellChecker.attachSpellCheckToComponent( fieldTextMedida )
+		spellChecker.attachSpellCheckToComponent( fieldText );
 	}
 	
 }
diff --git a/trunk/lib/evospellchecker.jar b/trunk/lib/evospellchecker.jar
new file mode 100644
index 00000000..147acbf0
Binary files /dev/null and b/trunk/lib/evospellchecker.jar differ