merge-update from trunk

diff --combined eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 27720e64be78b6422e83a791156e7102a52bfbfe,047cc98ec3188a6a3aef880a7ffbaebca0ac1286..fe370e94c4d376eb256aa9666127aa690a924028
--- 1/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -35,7 -35,6 +35,7 @@@ Export-Package: com.google.api
   eu.etaxonomy.cdm.database.update.v25_30,
   eu.etaxonomy.cdm.database.update.v30_31,
   eu.etaxonomy.cdm.ext.bci,
 + eu.etaxonomy.cdm.ext.biocase,
   eu.etaxonomy.cdm.ext.common,
   eu.etaxonomy.cdm.ext.dc,
   eu.etaxonomy.cdm.ext.geo,
@@@ -188,7 -187,6 +188,7 @@@
   org.apache.commons.lang;uses:="org.apache.commons.lang.exception",
   org.apache.fop.apps,
   org.apache.http,
 + org.apache.http.client,
   org.apache.log4j;uses:="org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi",
   org.apache.log4j.chainsaw;
    uses:="org.apache.log4j,
@@@ -243,20 -241,16 +243,21 @@@
     org.apache.log4j.spi,
     org.w3c.dom,
     org.xml.sax",
 + org.apache.lucene.index,
 + org.apache.lucene.queryParser,
   org.apache.lucene.util,
   org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
   org.apache.xerces.dom,
   org.h2.jdbc,
+  org.hamcrest,
   org.hibernate,
   org.hibernate.annotations.common.reflection,
   org.hibernate.cache.internal,
   org.hibernate.classic,
 + org.hibernate.criterion,
 + org.hibernate.envers.query.criteria,
   org.hibernate.search,
 + org.hibernate.search.spatial.impl,
   org.jadira.usertype.dateandtime.joda,
   org.jadira.usertype.dateandtime.shared.spi,
   org.jboss.logging,
@@@ -602,20 -596,4 +603,20 @@@ Bundle-ClassPath: .
   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
 + lib/h2mig_pagestore_addon.jar,
 + lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-io-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-model-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-print-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,
 + lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,
 + lib/cdmlib-services-3.2.4-SNAPSHOT.jar