From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Thu, 11 Jul 2013 12:00:55 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~968^2~12
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/2312fc7b8f438d1f527d6df8e6f27ed7e9c6f8ca

merge-update from trunk
---

diff --git a/.gitattributes b/.gitattributes
index d59419e40..0d423008f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -126,19 +126,11 @@ eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.cdmlib/README.txt -text
 eu.etaxonomy.taxeditor.cdmlib/build.properties -text
 eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/aopalliance-1.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/asm-attrs.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/asm.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.6.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.6.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/avalon-framework-4.2.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/avro-1.6.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-all-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/batik-anim-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/batik-awt-util-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/batik-bridge-1.7.jar -text
@@ -155,9 +147,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/batik-svggen-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/batik-transcoder-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/batik-util-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/batik-xml-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-ext-3.2.0-SNAPSHOT-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-ext-3.2.0-SNAPSHOT.jar -text
@@ -166,6 +156,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-io-3.2.0-SNAPSHOT.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-model-3.2.0-SNAPSHOT-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-model-3.2.0-SNAPSHOT.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT-tests.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-print-3.2.0-SNAPSHOT-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-print-3.2.0-SNAPSHOT.jar -text
@@ -173,27 +164,16 @@ eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-remote-3.2.0-SNAPSHOT-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-remote-3.2.0-SNAPSHOT.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-services-3.2.0-SNAPSHOT-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-services-3.2.0-SNAPSHOT.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/cglib-2.1.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.aopalliance-1.0.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.apache.commons.logging-1.1.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/concurrent-1.3.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/dbunit-2.4.9.jar -text
@@ -206,45 +186,29 @@ eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/h2mig_pagestore_addon.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-cglib-repack-2.1_3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-4.2.0.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-analyzers-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-tools-3.2.0.ga.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text
@@ -254,42 +218,25 @@ eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jakarta-regexp-1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb1-impl-2.2-EA.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc4-2.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdom-1.1.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-1.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-hibernate-1.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.2.3-jdk15.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.4-jdk15.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.17.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lsid-client-1.1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lsid-server-1.1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar -text
@@ -301,52 +248,30 @@ eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-java-0.8.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ognl-2.6.9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.osgi.core-1.0.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/osgi-3.6.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar -text
@@ -354,18 +279,11 @@ eu.etaxonomy.taxeditor.cdmlib/lib/paranamer-2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/saxon9he.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/serializer-2.7.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.5.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.5.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/snappy-java-1.0.4.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/solr-analysis-extras-3.6.2.jar -text
@@ -378,12 +296,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-cache-0.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8a.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-core-3.3.jar -text
@@ -395,36 +309,23 @@ eu.etaxonomy.taxeditor.cdmlib/lib/unitils-inject-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-mock-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-orm-3.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/unitils-spring-3.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/usertype.jodatime-2.0.1-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/usertype.jodatime-2.0.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/usertype.spi-2.0.1-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/usertype.spi-2.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl-2.11.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl-2.7.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.0.b2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.3.04.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-ext-1.3.04.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xml-resolver-1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlpull-1.1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xpp3_min-1.1.4c.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-8.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-9.0.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/pom.xml -text
 eu.etaxonomy.taxeditor.editor/.classpath -text
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java
index cab74e3cb..617fccf59 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java
@@ -143,7 +143,7 @@ public class NameEditorInput extends AbstractBulkEditorInput<TaxonNameBase> {
 	 */
 	@Override
 	public String getTypeText(Object entity) {
-		if(entity instanceof TaxonNameBase){
+		if((entity instanceof TaxonNameBase) && (((TaxonNameBase) entity).getNomenclaturalCode() != null)){
 			return ((TaxonNameBase) entity).getNomenclaturalCode().getTitleCache();
 		}
 		return super.getTypeText(entity);
diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index f20c4e69c..4e06f1f76 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-attrs.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.6.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.6.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/avalon-framework-4.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/batik-all-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
@@ -33,7 +24,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.2.0-SNAPSHOT.jar"/>
@@ -55,23 +45,13 @@
 	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.8.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.7-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar" sourcepath="lib/commons-dbcp-1.4-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
@@ -84,44 +64,27 @@
 	<classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ehcache-1.2.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.4.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/fop.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/h2-1.1.115.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar" sourcepath="lib/hibernate-core-4.1.10.Final-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-4.2.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-tools-3.2.0.ga.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
@@ -131,42 +94,25 @@
 	<classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/javassist-3.17.1-GA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javassist.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.1.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.1.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.0.GA-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.0.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.1.3.GA.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdbc-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdbc2_0-stdext.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jdom.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joda-time-1.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joda-time-hibernate-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.2.3-jdk15.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jta.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-4.8.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.14.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>
@@ -178,50 +124,29 @@
 	<classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mail-1.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.0.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.apache.commons.codec-1.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.equinox.common-3.6.0.v20110523.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.context.support-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.orm-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.security.core-3.1.3.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.security.web-3.1.1.RELEASE.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar" sourcepath="lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.jar"/>
@@ -229,18 +154,11 @@
 	<classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-3.9-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/poi-3.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/postgresql-8.2-504.jdbc4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/saxon9he.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/serializer-2.7.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/servlet-2.5.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
@@ -253,12 +171,8 @@
 	<classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-modules-lucene-0.8a.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.1.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.1.RELEASE.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/spring-xml-1.5.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/unitils-core-3.3.jar"/>
@@ -270,36 +184,26 @@
 	<classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/validation-api-1.0.0.GA.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xalan-2.6.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.3.04.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xom-1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xsltc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xstream-1.3.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-8.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 4a519895f..761591e11 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.2.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -394,19 +394,11 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.equinox.common
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
- lib/activation-1.1.jar,
- lib/antlr-2.7.6.jar,
  lib/antlr-2.7.7.jar,
  lib/aopalliance-1.0.jar,
- lib/asm-attrs.jar,
- lib/asm.jar,
- lib/aspectjrt-1.6.3.jar,
  lib/aspectjrt-1.7.1.jar,
- lib/aspectjweaver-1.6.3.jar,
  lib/aspectjweaver-1.7.1.jar,
- lib/avalon-framework-4.2.0.jar,
  lib/avro-1.6.3.jar,
- lib/batik-all-1.7.jar,
  lib/batik-anim-1.7.jar,
  lib/batik-awt-util-1.7.jar,
  lib/batik-bridge-1.7.jar,
@@ -423,45 +415,33 @@ Bundle-ClassPath: .,
  lib/batik-transcoder-1.7.jar,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.1.jar,
  lib/c3p0-0.9.2.jar,
- lib/cdmlib-commons-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.2.2-SNAPSHOT.jar,
- lib/cdmlib-ext-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.2.2-SNAPSHOT.jar,
- lib/cdmlib-io-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.2.2-SNAPSHOT.jar,
- lib/cdmlib-model-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.2.2-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.2.2-SNAPSHOT.jar,
- lib/cdmlib-print-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.2.2-SNAPSHOT.jar,
- lib/cdmlib-remote-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.2.2-SNAPSHOT.jar,
- lib/cdmlib-services-3.2.2-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.2.2-SNAPSHOT.jar,
- lib/cglib-2.1.3.jar,
+ lib/cdmlib-commons-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.2.3-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.2.3-SNAPSHOT.jar,
+ lib/cdmlib-io-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.2.3-SNAPSHOT.jar,
+ lib/cdmlib-model-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.2.3-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.2.3-SNAPSHOT.jar,
+ lib/cdmlib-print-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.2.3-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.2.3-SNAPSHOT.jar,
+ lib/cdmlib-services-3.2.3-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.2.3-SNAPSHOT.jar,
  lib/cglib-nodep-2.2.2.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
- lib/commons-beanutils-1.8.3-sources.jar,
  lib/commons-beanutils-1.8.3.jar,
- lib/commons-codec-1.7-sources.jar,
- lib/commons-codec-1.7.jar,
  lib/commons-codec-20041127.091804.jar,
  lib/commons-collections-3.2.1.jar,
- lib/commons-collections-3.2.jar,
- lib/commons-dbcp-1.4-sources.jar,
  lib/commons-dbcp-1.4.jar,
- lib/commons-io-2.4-sources.jar,
  lib/commons-io-2.4.jar,
- lib/commons-lang-2.6-sources.jar,
  lib/commons-lang-2.6.jar,
- lib/commons-logging-1.1.1-sources.jar,
- lib/commons-logging-1.1.1.jar,
  lib/commons-logging-1.1.2.jar,
- lib/commons-pool-1.5.4-sources.jar,
  lib/commons-pool-1.5.4.jar,
  lib/concurrent-1.3.4.jar,
  lib/dbunit-2.4.9.jar,
@@ -474,44 +454,27 @@ Bundle-ClassPath: .,
  lib/dozer-5.3.0.jar,
  lib/easymock-3.1.jar,
  lib/easymockclassextension-2.3.jar,
- lib/ehcache-1.2.3.jar,
  lib/ehcache-core-2.4.3.jar,
- lib/ezmorph-1.0.6-sources.jar,
  lib/ezmorph-1.0.6.jar,
  lib/fop-1.1.jar,
- lib/fop.jar,
- lib/google-api-translate-java-0.92.jar,
  lib/guava-r05.jar,
- lib/h2-1.1.115.jar,
  lib/h2-1.3.170.jar,
  lib/hamcrest-core-1.3.jar,
  lib/hibernate-c3p0-4.1.10.Final.jar,
  lib/hibernate-cglib-repack-2.1_3.jar,
- lib/hibernate-commons-annotations-4.0.1.Final-sources.jar,
  lib/hibernate-commons-annotations-4.0.1.Final.jar,
- lib/hibernate-core-4.1.10.Final-sources.jar,
  lib/hibernate-core-4.1.10.Final.jar,
  lib/hibernate-ehcache-4.1.10.Final.jar,
  lib/hibernate-entitymanager-4.1.10.Final.jar,
- lib/hibernate-envers-4.1.10.Final-sources.jar,
  lib/hibernate-envers-4.1.10.Final.jar,
- lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar,
  lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,
  lib/hibernate-search-4.2.0.Final.jar,
  lib/hibernate-search-analyzers-4.2.0.Final.jar,
- lib/hibernate-search-engine-4.2.0.Final-sources.jar,
  lib/hibernate-search-engine-4.2.0.Final.jar,
- lib/hibernate-search-orm-4.2.0.Final-sources.jar,
  lib/hibernate-search-orm-4.2.0.Final.jar,
- lib/hibernate-tools-3.2.0.ga.jar,
- lib/hibernate-validator-4.3.1.Final-sources.jar,
  lib/hibernate-validator-4.3.1.Final.jar,
  lib/hsqldb-1.8.0.10.jar,
- lib/hsqldb.jar,
- lib/httpclient-4.2.3-sources.jar,
  lib/httpclient-4.2.3.jar,
- lib/httpcore-4.2.3-sources.jar,
- lib/httpcore-4.2.3.jar,
  lib/httpcore-4.2.4.jar,
  lib/icu4j-2.6.1.jar,
  lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
@@ -521,42 +484,25 @@ Bundle-ClassPath: .,
  lib/jackson-mapper-asl-1.8.8.jar,
  lib/jakarta-regexp-1.4.jar,
  lib/javassist-3.17.1-GA.jar,
- lib/javassist.jar,
- lib/jaxb-api-2.1.6.jar,
  lib/jaxb-api-2.2.7.jar,
- lib/jaxb-impl-2.1.6.jar,
  lib/jaxb-impl-2.2-EA.jar,
  lib/jaxb-xjc-2.2-EA.jar,
  lib/jaxb1-impl-2.2-EA.jar,
- lib/jaxen-1.1.4-sources.jar,
  lib/jaxen-1.1.4.jar,
- lib/jboss-logging-3.1.0.GA-sources.jar,
- lib/jboss-logging-3.1.0.GA.jar,
  lib/jboss-logging-3.1.3.GA.jar,
  lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
- lib/jdbc-1.2.jar,
- lib/jdbc2_0-stdext.jar,
  lib/jdbc4-2.0.jar,
  lib/jdom-1.1.3.jar,
- lib/jdom.jar,
- lib/joda-time-1.5.jar,
  lib/joda-time-2.1.jar,
- lib/joda-time-hibernate-1.0.jar,
- lib/json-lib-2.2.3-jdk15.jar,
  lib/json-lib-2.4-jdk15.jar,
  lib/jsr250-api-1.0.jar,
- lib/jta.jar,
- lib/jtds-1.3.0-sources.jar,
  lib/jtds-1.3.0.jar,
  lib/junit-4.11.jar,
- lib/junit-4.8.1.jar,
  lib/junit-benchmarks-0.5.0.jar,
- lib/log4j-1.2.14.jar,
  lib/log4j-1.2.17.jar,
  lib/lsid-client-1.1.2.jar,
  lib/lsid-server-1.1.2.jar,
  lib/lucene-analyzers-3.6.2.jar,
- lib/lucene-core-3.6.2-sources.jar,
  lib/lucene-core-3.6.2.jar,
  lib/lucene-facet-3.6.2.jar,
  lib/lucene-grouping-3.6.2.jar,
@@ -568,50 +514,29 @@ Bundle-ClassPath: .,
  lib/lucene-queries-3.6.2.jar,
  lib/lucene-smartcn-3.6.2.jar,
  lib/lucene-spatial-3.6.2.jar,
- lib/lucene-spellchecker-3.6.2-sources.jar,
  lib/lucene-spellchecker-3.6.2.jar,
  lib/lucene-stempel-3.6.2.jar,
- lib/mail-1.4.jar,
  lib/mchange-commons-java-0.2.3.3.jar,
- lib/mysql-connector-java-5.0.5.jar,
  lib/mysql-connector-java-5.1.24.jar,
  lib/objenesis-1.2.jar,
- lib/odfdom-0.8.jar,
  lib/odfdom-java-0.8.7.jar,
  lib/ognl-2.6.9.jar,
  lib/opencsv-2.3.jar,
- lib/org.apache.commons.codec-1.3.0.jar,
+ lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,
+ lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,
  lib/org.osgi.core-1.0.0.jar,
- lib/org.springframework.aop-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.aop-3.2.2.RELEASE.jar,
- lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.aspects-3.2.2.RELEASE.jar,
- lib/org.springframework.beans-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.beans-3.2.2.RELEASE.jar,
- lib/org.springframework.context-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.context-3.2.2.RELEASE.jar,
- lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar,
- lib/org.springframework.context.support-3.2.2.RELEASE.jar,
- lib/org.springframework.core-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.core-3.2.2.RELEASE.jar,
- lib/org.springframework.expression-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.expression-3.2.2.RELEASE.jar,
- lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.jdbc-3.2.2.RELEASE.jar,
- lib/org.springframework.orm-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.orm-3.2.2.RELEASE.jar,
- lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.oxm-3.2.2.RELEASE.jar,
- lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar,
- lib/org.springframework.security.core-3.1.3.RELEASE.jar,
- lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar,
- lib/org.springframework.security.web-3.1.1.RELEASE.jar,
  lib/org.springframework.test-3.2.2.RELEASE.jar,
- lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.transaction-3.2.2.RELEASE.jar,
- lib/org.springframework.web-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.web-3.2.2.RELEASE.jar,
- lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar,
  lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,
  lib/osgi-3.6.0.jar,
  lib/p6spy-1.3.jar,
@@ -619,18 +544,11 @@ Bundle-ClassPath: .,
  lib/plexus-classworlds-1.2-alpha-9.jar,
  lib/plexus-container-default-1.0-alpha-30.jar,
  lib/plexus-utils-2.0.5.jar,
- lib/poi-3.9-sources.jar,
  lib/poi-3.9.jar,
- lib/postgresql-8.2-504.jdbc4.jar,
  lib/postgresql-9.1-901.jdbc4.jar,
  lib/sanselan-0.97-incubator.jar,
- lib/saxon9he.jar,
- lib/serializer-2.7.0.jar,
- lib/servlet-2.5.0.jar,
  lib/servlet-api-2.5.jar,
- lib/slf4j-api-1.5.2.jar,
  lib/slf4j-api-1.7.2.jar,
- lib/slf4j-log4j12-1.5.2.jar,
  lib/slf4j-log4j12-1.7.2.jar,
  lib/snappy-java-1.0.4.1.jar,
  lib/solr-analysis-extras-3.6.2.jar,
@@ -643,12 +561,8 @@ Bundle-ClassPath: .,
  lib/spring-core-3.2.2.RELEASE.jar,
  lib/spring-expression-3.2.2.RELEASE.jar,
  lib/spring-modules-cache-0.7.jar,
- lib/spring-modules-lucene-0.8a.jar,
- lib/spring-security-config-3.1.1.RELEASE-sources.jar,
- lib/spring-security-config-3.1.1.RELEASE.jar,
  lib/spring-security-config-3.1.3.RELEASE.jar,
  lib/spring-security-core-3.1.3.RELEASE.jar,
- lib/spring-xml-1.5.6.jar,
  lib/stax-1.2.0.jar,
  lib/stax-api-1.0.1.jar,
  lib/unitils-core-3.3.jar,
@@ -660,35 +574,24 @@ Bundle-ClassPath: .,
  lib/unitils-mock-3.3.jar,
  lib/unitils-orm-3.3.jar,
  lib/unitils-spring-3.3.jar,
- lib/usertype.jodatime-2.0.1-sources.jar,
  lib/usertype.jodatime-2.0.1.jar,
- lib/usertype.spi-2.0.1-sources.jar,
  lib/usertype.spi-2.0.1.jar,
  lib/validation-api-1.0.0.GA.jar,
- lib/wsdl4j-1.6.2-sources.jar,
  lib/wsdl4j-1.6.2.jar,
  lib/xalan-2.6.0.jar,
- lib/xalan-2.7.0.jar,
  lib/xercesImpl-2.11.0.jar,
- lib/xercesImpl-2.7.1.jar,
- lib/xercesImpl.jar,
  lib/xml-apis-1.0.b2.jar,
- lib/xml-apis-1.3.04.jar,
  lib/xml-apis-ext-1.3.04.jar,
- lib/xml-apis.jar,
  lib/xml-resolver-1.2.jar,
- lib/xmlgraphics-commons-1.3.1.jar,
  lib/xmlgraphics-commons-1.5.jar,
  lib/xmlParserAPIs-2.6.2.jar,
  lib/xmlpull-1.1.3.1.jar,
  lib/xmlunit-1.4.jar,
  lib/xom-1.0.jar,
  lib/xpp3_min-1.1.4c.jar,
- lib/xpp3-1.1.4c-sources.jar,
  lib/xpp3-1.1.4c.jar,
- lib/xsltc.jar,
- lib/xstream-1.3.1.jar,
  lib/xstream-1.4.4.jar,
- lib/yjp-controller-api-redist-8.0.1.jar,
  lib/yjp-controller-api-redist-9.0.8.jar,
+ lib/google-api-translate-java-0.92.jar,
+ lib/odfdom-0.8.jar,
  lib/h2mig_pagestore_addon.jar
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index f8a869d27..f2d0e9890 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -1,18 +1,10 @@
 bin.includes = META-INF/,\
                lib/activation-1.1.1.jar,\
-               lib/activation-1.1.jar,\
-               lib/antlr-2.7.6.jar,\
                lib/antlr-2.7.7.jar,\
                lib/aopalliance-1.0.jar,\
-               lib/asm-attrs.jar,\
-               lib/asm.jar,\
-               lib/aspectjrt-1.6.3.jar,\
                lib/aspectjrt-1.7.1.jar,\
-               lib/aspectjweaver-1.6.3.jar,\
                lib/aspectjweaver-1.7.1.jar,\
-               lib/avalon-framework-4.2.0.jar,\
                lib/avro-1.6.3.jar,\
-               lib/batik-all-1.7.jar,\
                lib/batik-anim-1.7.jar,\
                lib/batik-awt-util-1.7.jar,\
                lib/batik-bridge-1.7.jar,\
@@ -29,45 +21,33 @@ bin.includes = META-INF/,\
                lib/batik-transcoder-1.7.jar,\
                lib/batik-util-1.7.jar,\
                lib/batik-xml-1.7.jar,\
-               lib/c3p0-0.9.1.jar,\
                lib/c3p0-0.9.2.jar,\
-               lib/cdmlib-commons-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-commons-3.2.2-SNAPSHOT.jar,\
-               lib/cdmlib-ext-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-ext-3.2.2-SNAPSHOT.jar,\
-               lib/cdmlib-io-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-io-3.2.2-SNAPSHOT.jar,\
-               lib/cdmlib-model-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-model-3.2.2-SNAPSHOT.jar,\
-               lib/cdmlib-persistence-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-persistence-3.2.2-SNAPSHOT.jar,\
-               lib/cdmlib-print-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-print-3.2.2-SNAPSHOT.jar,\
-               lib/cdmlib-remote-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-remote-3.2.2-SNAPSHOT.jar,\
-               lib/cdmlib-services-3.2.2-SNAPSHOT-sources.jar,\
-               lib/cdmlib-services-3.2.2-SNAPSHOT.jar,\
-               lib/cglib-2.1.3.jar,\
+               lib/cdmlib-commons-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-commons-3.2.3-SNAPSHOT.jar,\
+               lib/cdmlib-ext-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-ext-3.2.3-SNAPSHOT.jar,\
+               lib/cdmlib-io-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-io-3.2.3-SNAPSHOT.jar,\
+               lib/cdmlib-model-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-model-3.2.3-SNAPSHOT.jar,\
+               lib/cdmlib-persistence-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-persistence-3.2.3-SNAPSHOT.jar,\
+               lib/cdmlib-print-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-print-3.2.3-SNAPSHOT.jar,\
+               lib/cdmlib-remote-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-remote-3.2.3-SNAPSHOT.jar,\
+               lib/cdmlib-services-3.2.3-SNAPSHOT-sources.jar,\
+               lib/cdmlib-services-3.2.3-SNAPSHOT.jar,\
                lib/cglib-nodep-2.2.2.jar,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
-               lib/commons-beanutils-1.8.3-sources.jar,\
                lib/commons-beanutils-1.8.3.jar,\
-               lib/commons-codec-1.7-sources.jar,\
-               lib/commons-codec-1.7.jar,\
                lib/commons-codec-20041127.091804.jar,\
                lib/commons-collections-3.2.1.jar,\
-               lib/commons-collections-3.2.jar,\
-               lib/commons-dbcp-1.4-sources.jar,\
                lib/commons-dbcp-1.4.jar,\
-               lib/commons-io-2.4-sources.jar,\
                lib/commons-io-2.4.jar,\
-               lib/commons-lang-2.6-sources.jar,\
                lib/commons-lang-2.6.jar,\
-               lib/commons-logging-1.1.1-sources.jar,\
-               lib/commons-logging-1.1.1.jar,\
                lib/commons-logging-1.1.2.jar,\
-               lib/commons-pool-1.5.4-sources.jar,\
                lib/commons-pool-1.5.4.jar,\
                lib/concurrent-1.3.4.jar,\
                lib/dbunit-2.4.9.jar,\
@@ -80,44 +60,27 @@ bin.includes = META-INF/,\
                lib/dozer-5.3.0.jar,\
                lib/easymock-3.1.jar,\
                lib/easymockclassextension-2.3.jar,\
-               lib/ehcache-1.2.3.jar,\
                lib/ehcache-core-2.4.3.jar,\
-               lib/ezmorph-1.0.6-sources.jar,\
                lib/ezmorph-1.0.6.jar,\
                lib/fop-1.1.jar,\
-               lib/fop.jar,\
-               lib/google-api-translate-java-0.92.jar,\
                lib/guava-r05.jar,\
-               lib/h2-1.1.115.jar,\
                lib/h2-1.3.170.jar,\
                lib/hamcrest-core-1.3.jar,\
                lib/hibernate-c3p0-4.1.10.Final.jar,\
                lib/hibernate-cglib-repack-2.1_3.jar,\
-               lib/hibernate-commons-annotations-4.0.1.Final-sources.jar,\
                lib/hibernate-commons-annotations-4.0.1.Final.jar,\
-               lib/hibernate-core-4.1.10.Final-sources.jar,\
                lib/hibernate-core-4.1.10.Final.jar,\
                lib/hibernate-ehcache-4.1.10.Final.jar,\
                lib/hibernate-entitymanager-4.1.10.Final.jar,\
-               lib/hibernate-envers-4.1.10.Final-sources.jar,\
                lib/hibernate-envers-4.1.10.Final.jar,\
-               lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar,\
                lib/hibernate-jpa-2.0-api-1.0.1.Final.jar,\
                lib/hibernate-search-4.2.0.Final.jar,\
                lib/hibernate-search-analyzers-4.2.0.Final.jar,\
-               lib/hibernate-search-engine-4.2.0.Final-sources.jar,\
                lib/hibernate-search-engine-4.2.0.Final.jar,\
-               lib/hibernate-search-orm-4.2.0.Final-sources.jar,\
                lib/hibernate-search-orm-4.2.0.Final.jar,\
-               lib/hibernate-tools-3.2.0.ga.jar,\
-               lib/hibernate-validator-4.3.1.Final-sources.jar,\
                lib/hibernate-validator-4.3.1.Final.jar,\
                lib/hsqldb-1.8.0.10.jar,\
-               lib/hsqldb.jar,\
-               lib/httpclient-4.2.3-sources.jar,\
                lib/httpclient-4.2.3.jar,\
-               lib/httpcore-4.2.3-sources.jar,\
-               lib/httpcore-4.2.3.jar,\
                lib/httpcore-4.2.4.jar,\
                lib/icu4j-2.6.1.jar,\
                lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar,\
@@ -127,42 +90,25 @@ bin.includes = META-INF/,\
                lib/jackson-mapper-asl-1.8.8.jar,\
                lib/jakarta-regexp-1.4.jar,\
                lib/javassist-3.17.1-GA.jar,\
-               lib/javassist.jar,\
-               lib/jaxb-api-2.1.6.jar,\
                lib/jaxb-api-2.2.7.jar,\
-               lib/jaxb-impl-2.1.6.jar,\
                lib/jaxb-impl-2.2-EA.jar,\
                lib/jaxb-xjc-2.2-EA.jar,\
                lib/jaxb1-impl-2.2-EA.jar,\
-               lib/jaxen-1.1.4-sources.jar,\
                lib/jaxen-1.1.4.jar,\
-               lib/jboss-logging-3.1.0.GA-sources.jar,\
-               lib/jboss-logging-3.1.0.GA.jar,\
                lib/jboss-logging-3.1.3.GA.jar,\
                lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar,\
-               lib/jdbc-1.2.jar,\
-               lib/jdbc2_0-stdext.jar,\
                lib/jdbc4-2.0.jar,\
                lib/jdom-1.1.3.jar,\
-               lib/jdom.jar,\
-               lib/joda-time-1.5.jar,\
                lib/joda-time-2.1.jar,\
-               lib/joda-time-hibernate-1.0.jar,\
-               lib/json-lib-2.2.3-jdk15.jar,\
                lib/json-lib-2.4-jdk15.jar,\
                lib/jsr250-api-1.0.jar,\
-               lib/jta.jar,\
-               lib/jtds-1.3.0-sources.jar,\
                lib/jtds-1.3.0.jar,\
                lib/junit-4.11.jar,\
-               lib/junit-4.8.1.jar,\
                lib/junit-benchmarks-0.5.0.jar,\
-               lib/log4j-1.2.14.jar,\
                lib/log4j-1.2.17.jar,\
                lib/lsid-client-1.1.2.jar,\
                lib/lsid-server-1.1.2.jar,\
                lib/lucene-analyzers-3.6.2.jar,\
-               lib/lucene-core-3.6.2-sources.jar,\
                lib/lucene-core-3.6.2.jar,\
                lib/lucene-facet-3.6.2.jar,\
                lib/lucene-grouping-3.6.2.jar,\
@@ -174,50 +120,29 @@ bin.includes = META-INF/,\
                lib/lucene-queries-3.6.2.jar,\
                lib/lucene-smartcn-3.6.2.jar,\
                lib/lucene-spatial-3.6.2.jar,\
-               lib/lucene-spellchecker-3.6.2-sources.jar,\
                lib/lucene-spellchecker-3.6.2.jar,\
                lib/lucene-stempel-3.6.2.jar,\
-               lib/mail-1.4.jar,\
                lib/mchange-commons-java-0.2.3.3.jar,\
-               lib/mysql-connector-java-5.0.5.jar,\
                lib/mysql-connector-java-5.1.24.jar,\
                lib/objenesis-1.2.jar,\
-               lib/odfdom-0.8.jar,\
                lib/odfdom-java-0.8.7.jar,\
                lib/ognl-2.6.9.jar,\
                lib/opencsv-2.3.jar,\
-               lib/org.apache.commons.codec-1.3.0.jar,\
+               lib/org.eclipse.equinox.common-3.6.0.v20110523.jar,\
+               lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar,\
                lib/org.osgi.core-1.0.0.jar,\
-               lib/org.springframework.aop-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.aop-3.2.2.RELEASE.jar,\
-               lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.aspects-3.2.2.RELEASE.jar,\
-               lib/org.springframework.beans-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.beans-3.2.2.RELEASE.jar,\
-               lib/org.springframework.context-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.context-3.2.2.RELEASE.jar,\
-               lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar,\
-               lib/org.springframework.context.support-3.2.2.RELEASE.jar,\
-               lib/org.springframework.core-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.core-3.2.2.RELEASE.jar,\
-               lib/org.springframework.expression-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.expression-3.2.2.RELEASE.jar,\
-               lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.jdbc-3.2.2.RELEASE.jar,\
-               lib/org.springframework.orm-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.orm-3.2.2.RELEASE.jar,\
-               lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.oxm-3.2.2.RELEASE.jar,\
-               lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar,\
-               lib/org.springframework.security.core-3.1.3.RELEASE.jar,\
-               lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar,\
-               lib/org.springframework.security.web-3.1.1.RELEASE.jar,\
                lib/org.springframework.test-3.2.2.RELEASE.jar,\
-               lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.transaction-3.2.2.RELEASE.jar,\
-               lib/org.springframework.web-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.web-3.2.2.RELEASE.jar,\
-               lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar,\
                lib/org.springframework.web.servlet-3.2.2.RELEASE.jar,\
                lib/osgi-3.6.0.jar,\
                lib/p6spy-1.3.jar,\
@@ -225,18 +150,11 @@ bin.includes = META-INF/,\
                lib/plexus-classworlds-1.2-alpha-9.jar,\
                lib/plexus-container-default-1.0-alpha-30.jar,\
                lib/plexus-utils-2.0.5.jar,\
-               lib/poi-3.9-sources.jar,\
                lib/poi-3.9.jar,\
-               lib/postgresql-8.2-504.jdbc4.jar,\
                lib/postgresql-9.1-901.jdbc4.jar,\
                lib/sanselan-0.97-incubator.jar,\
-               lib/saxon9he.jar,\
-               lib/serializer-2.7.0.jar,\
-               lib/servlet-2.5.0.jar,\
                lib/servlet-api-2.5.jar,\
-               lib/slf4j-api-1.5.2.jar,\
                lib/slf4j-api-1.7.2.jar,\
-               lib/slf4j-log4j12-1.5.2.jar,\
                lib/slf4j-log4j12-1.7.2.jar,\
                lib/snappy-java-1.0.4.1.jar,\
                lib/solr-analysis-extras-3.6.2.jar,\
@@ -249,12 +167,8 @@ bin.includes = META-INF/,\
                lib/spring-core-3.2.2.RELEASE.jar,\
                lib/spring-expression-3.2.2.RELEASE.jar,\
                lib/spring-modules-cache-0.7.jar,\
-               lib/spring-modules-lucene-0.8a.jar,\
-               lib/spring-security-config-3.1.1.RELEASE-sources.jar,\
-               lib/spring-security-config-3.1.1.RELEASE.jar,\
                lib/spring-security-config-3.1.3.RELEASE.jar,\
                lib/spring-security-core-3.1.3.RELEASE.jar,\
-               lib/spring-xml-1.5.6.jar,\
                lib/stax-1.2.0.jar,\
                lib/stax-api-1.0.1.jar,\
                lib/unitils-core-3.3.jar,\
@@ -266,36 +180,25 @@ bin.includes = META-INF/,\
                lib/unitils-mock-3.3.jar,\
                lib/unitils-orm-3.3.jar,\
                lib/unitils-spring-3.3.jar,\
-               lib/usertype.jodatime-2.0.1-sources.jar,\
                lib/usertype.jodatime-2.0.1.jar,\
-               lib/usertype.spi-2.0.1-sources.jar,\
                lib/usertype.spi-2.0.1.jar,\
                lib/validation-api-1.0.0.GA.jar,\
-               lib/wsdl4j-1.6.2-sources.jar,\
                lib/wsdl4j-1.6.2.jar,\
                lib/xalan-2.6.0.jar,\
-               lib/xalan-2.7.0.jar,\
                lib/xercesImpl-2.11.0.jar,\
-               lib/xercesImpl-2.7.1.jar,\
-               lib/xercesImpl.jar,\
                lib/xml-apis-1.0.b2.jar,\
-               lib/xml-apis-1.3.04.jar,\
                lib/xml-apis-ext-1.3.04.jar,\
-               lib/xml-apis.jar,\
                lib/xml-resolver-1.2.jar,\
-               lib/xmlgraphics-commons-1.3.1.jar,\
                lib/xmlgraphics-commons-1.5.jar,\
                lib/xmlParserAPIs-2.6.2.jar,\
                lib/xmlpull-1.1.3.1.jar,\
                lib/xmlunit-1.4.jar,\
                lib/xom-1.0.jar,\
                lib/xpp3_min-1.1.4c.jar,\
-               lib/xpp3-1.1.4c-sources.jar,\
                lib/xpp3-1.1.4c.jar,\
-               lib/xsltc.jar,\
-               lib/xstream-1.3.1.jar,\
                lib/xstream-1.4.4.jar,\
-               lib/yjp-controller-api-redist-8.0.1.jar,\
                lib/yjp-controller-api-redist-9.0.8.jar,\
+               lib/google-api-translate-java-0.92.jar,\
+               lib/odfdom-0.8.jar,\
                lib/h2mig_pagestore_addon.jar
 
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.jar
deleted file mode 100644
index 66d290ee4..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.6.jar
deleted file mode 100644
index 3702b645f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/asm-attrs.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/asm-attrs.jar
deleted file mode 100644
index f07bcb2b4..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/asm-attrs.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/asm.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/asm.jar
deleted file mode 100644
index ee0c7ccd2..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/asm.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.6.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.6.3.jar
deleted file mode 100644
index 5e62f7686..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.6.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.6.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.6.3.jar
deleted file mode 100644
index 274783a84..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.6.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/avalon-framework-4.2.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/avalon-framework-4.2.0.jar
deleted file mode 100644
index 22a7ab341..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/avalon-framework-4.2.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-all-1.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/batik-all-1.7.jar
deleted file mode 100644
index 589328581..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/batik-all-1.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.1.jar
deleted file mode 100644
index 693667a34..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar
deleted file mode 100644
index cdcf36770..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT.jar
index 507d62034..99c6fb152 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-commons-3.2.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-ext-3.2.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-ext-3.2.0-SNAPSHOT.jar
index 86d20f3b0..c63585174 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-ext-3.2.0-SNAPSHOT.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-ext-3.2.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-io-3.2.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-io-3.2.0-SNAPSHOT.jar
index b6aa02f90..0dd1865e1 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-io-3.2.0-SNAPSHOT.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-io-3.2.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-model-3.2.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-model-3.2.0-SNAPSHOT.jar
index 83da058f8..a55b4fcb9 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-model-3.2.0-SNAPSHOT.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-model-3.2.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT-tests.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT-tests.jar
new file mode 100644
index 000000000..b621f4d48
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT-tests.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar
index 6e4a476e8..9922c6c38 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-persistence-3.2.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-remote-3.2.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-remote-3.2.0-SNAPSHOT.jar
index f84c0c8a5..7d804d9a3 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-remote-3.2.0-SNAPSHOT.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-remote-3.2.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-services-3.2.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-services-3.2.0-SNAPSHOT.jar
index 23dabf29b..28bfcaed9 100644
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-services-3.2.0-SNAPSHOT.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib-services-3.2.0-SNAPSHOT.jar differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-2.1.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-2.1.3.jar
deleted file mode 100644
index ddfbdb05a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/cglib-2.1.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3-sources.jar
deleted file mode 100644
index 422d23dd0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7-sources.jar
deleted file mode 100644
index e5bd24981..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7.jar
deleted file mode 100644
index efa7f7291..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.jar
deleted file mode 100644
index 75580be25..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4-sources.jar
deleted file mode 100644
index 90f9bf739..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4-sources.jar
deleted file mode 100644
index f4ebc7b47..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6-sources.jar
deleted file mode 100644
index b4230533a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1-sources.jar
deleted file mode 100644
index 65a38711e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1.jar
deleted file mode 100644
index 1deef144c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4-sources.jar
deleted file mode 100644
index e6956dace..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar
deleted file mode 100644
index 0f8cd2c44..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar
deleted file mode 100644
index 8d56b6bc5..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar
deleted file mode 100644
index 24419bcf0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar
deleted file mode 100644
index a59dcb7a1..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final-sources.jar
deleted file mode 100644
index d4b68f2d0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final-sources.jar
deleted file mode 100644
index c699980dc..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final-sources.jar
deleted file mode 100644
index 2a62b671d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar
deleted file mode 100644
index f1c0086bc..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final-sources.jar
deleted file mode 100644
index 5170a7856..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final-sources.jar
deleted file mode 100644
index 632711c57..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-tools-3.2.0.ga.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-tools-3.2.0.ga.jar
deleted file mode 100644
index 316edb947..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-tools-3.2.0.ga.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final-sources.jar
deleted file mode 100644
index dc99e5721..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar
deleted file mode 100644
index dc3055e44..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar
deleted file mode 100644
index a3bca6906..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3-sources.jar
deleted file mode 100644
index 1e9334629..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3.jar
deleted file mode 100644
index 9e85895bf..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar
old mode 100755
new mode 100644
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar
deleted file mode 100644
index a6bde7781..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar
deleted file mode 100644
index be3d6dca2..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar
deleted file mode 100644
index 54444d27f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar
deleted file mode 100644
index 9f5f1a834..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA-sources.jar
deleted file mode 100644
index cb394cf65..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA.jar
deleted file mode 100644
index 72113b0f8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.0.GA.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar
deleted file mode 100644
index bcc4da35f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar
deleted file mode 100644
index ddafa130b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar
deleted file mode 100644
index 65a1b3f73..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-1.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-1.5.jar
deleted file mode 100644
index 6e753f68a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-1.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-hibernate-1.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-hibernate-1.0.jar
deleted file mode 100644
index 4d9561f13..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-hibernate-1.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.2.3-jdk15.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.2.3-jdk15.jar
deleted file mode 100644
index 8c92fab08..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.2.3-jdk15.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar
deleted file mode 100644
index e0822a966..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar
deleted file mode 100644
index 0a47b4093..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar
deleted file mode 100644
index 524cd65ce..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar
deleted file mode 100644
index 625130719..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2-sources.jar
deleted file mode 100644
index 658cd9636..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2-sources.jar
deleted file mode 100644
index 8beb682fb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar
deleted file mode 100644
index 3b28b6ea9..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar
deleted file mode 100644
index af8ec67cb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar
deleted file mode 100644
index d9b4c8ea1..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 7136590a2..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index d5c411053..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index e403722c7..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index aa7d4e777..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 99a70a46e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE.jar
deleted file mode 100644
index a4dba3ada..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context.support-3.2.2.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index e372eb2a0..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 1bb2a78b5..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 780ddd96c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 367d4ddd3..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index b9bfc6a63..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar
deleted file mode 100644
index 49448aabb..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE.jar
deleted file mode 100644
index 462e9d503..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.core-3.1.3.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar
deleted file mode 100644
index 6b825888f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE.jar
deleted file mode 100644
index 1487e9cef..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.security.web-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 6ddaa8aa8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 475170e54..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar
deleted file mode 100644
index 4bb60dada..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar
deleted file mode 100644
index 50034e90b..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar
deleted file mode 100644
index f69e3643d..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/saxon9he.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/saxon9he.jar
deleted file mode 100644
index 040e5e01a..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/saxon9he.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/serializer-2.7.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/serializer-2.7.0.jar
deleted file mode 100644
index 7cd806964..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/serializer-2.7.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar
deleted file mode 100644
index f26b78b16..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/servlet-2.5.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.5.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.5.2.jar
deleted file mode 100644
index 438286601..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.5.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.5.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.5.2.jar
deleted file mode 100644
index 2c040a168..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.5.2.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8a.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8a.jar
deleted file mode 100644
index 9574b0498..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8a.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE-sources.jar
deleted file mode 100644
index 606f60f17..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE.jar
deleted file mode 100644
index ec98ed8d6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.1.RELEASE.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar
deleted file mode 100644
index 2a95501a8..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/usertype.jodatime-2.0.1-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/usertype.jodatime-2.0.1-sources.jar
deleted file mode 100644
index 7c5ee372f..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/usertype.jodatime-2.0.1-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/usertype.spi-2.0.1-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/usertype.spi-2.0.1-sources.jar
deleted file mode 100644
index 8daf5f008..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/usertype.spi-2.0.1-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar
deleted file mode 100644
index 9fb73b4e3..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar
deleted file mode 100644
index 979ee761c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl-2.7.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl-2.7.1.jar
deleted file mode 100644
index eac75ae8e..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl-2.7.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl.jar
deleted file mode 100644
index e0a4c2e37..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.3.04.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.3.04.jar
deleted file mode 100644
index d42c0ea6c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.3.04.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis.jar
deleted file mode 100644
index d42c0ea6c..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.3.1.jar
deleted file mode 100644
index 81a485dc4..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.3.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar
deleted file mode 100644
index 036c7b701..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar
deleted file mode 100644
index 28bc23882..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar
deleted file mode 100644
index 4ef4219c6..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-8.0.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-8.0.1.jar
deleted file mode 100644
index 51ed32296..000000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-8.0.1.jar and /dev/null differ
diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 58e39760d..37c23bd48 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.2.3-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 26e0e061d..8e6d41024 100644
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.2.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index dece78af0..a4439fa59 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -257,6 +257,16 @@
                      definitionId="isAcceptedAndHasNoHomotypicSynonyms">
                </reference>
             </visibleWhen-->
+                <visibleWhen>                  
+                     <or>
+                        <reference
+                              definitionId="isAcceptedTaxon">
+                        </reference>
+                        <reference
+                              definitionId="isMisapplication">
+                        </reference>
+                     </or>                  
+               </visibleWhen>
          </command>
          <menu
                label="Change To">
diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index 821815dd7..7855a2022 100644
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
 	<groupId>eu.etaxonomy</groupId>
 	<artifactId>taxeditor-parent</artifactId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>3.2.3-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java
index 74311dc3b..0886e1fc2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java
@@ -52,6 +52,7 @@ public class KeyEditor extends FormEditor implements IConversationEnabled,
 	public void doSave(IProgressMonitor monitor) {
 		try {
 			monitor.beginTask("Saving Editor", 1);
+			getConversationHolder().bind();
 			getConversationHolder().commit(true);
 			setDirty(false);
 			monitor.worked(1);
@@ -80,6 +81,11 @@ public class KeyEditor extends FormEditor implements IConversationEnabled,
 		return false;
 	}
 
+	@Override
+	public void setFocus() {
+		getConversationHolder().bind();
+		super.setFocus();
+	}
 	/*
 	 * (non-Javadoc)
 	 *