merge-update from trunk

diff --combined eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index 61c72751cc72b36ce68409254b0675f6cd9f04e1,d07627b55f712472954ce72f8c7c98b174110782..4156ee903497de2c067a7e3ff04aaf2f41013cfd
--- 1/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@@ -2,19 -2,10 +2,19 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Bulkeditor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
- Bundle-Version: 3.3.0.qualifier
+ Bundle-Version: 3.3.0.201401161011
  Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
  Bundle-Vendor: EDIT
 -Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
 +Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
 + eu.etaxonomy.taxeditor.annotatedlineeditor.handler,
 + eu.etaxonomy.taxeditor.bulkeditor,
 + eu.etaxonomy.taxeditor.bulkeditor.command,
 + eu.etaxonomy.taxeditor.bulkeditor.handler,
 + eu.etaxonomy.taxeditor.bulkeditor.input,
 + eu.etaxonomy.taxeditor.bulkeditor.internal,
 + eu.etaxonomy.taxeditor.bulkeditor.referencingobjects,
 + eu.etaxonomy.taxeditor.dataimport,
 + eu.etaxonomy.taxeditor.dataimport.wizard
  Require-Bundle: org.eclipse.ui,
   org.eclipse.core.runtime,
   org.eclipse.ui.editors,

diff --combined eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 3fb4ffb0f58e4c31c1f30461d1e9ac719287370d,9f6633b4dd215c944bf53f335422890eef0b1a7d..56e85c9b481dc4dd4642e65cc79c220938046485
--- 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
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: CDM Library Dependencies Plugin
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
- Bundle-Version: 3.3.0.qualifier
+ Bundle-Version: 3.3.0.201401161011
  Eclipse-BundleShape: dir
  Export-Package: com.google.api,
   com.google.api.detect,
@@@ -35,7 -35,6 +35,7 @@@
   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,
@@@ -184,7 -183,6 +184,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,
@@@ -239,8 -237,6 +239,8 @@@
     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,
@@@ -250,10 -246,7 +250,10 @@@
   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,
@@@ -421,22 -414,22 +421,22 @@@ Bundle-ClassPath: .
   lib/batik-util-1.7.jar,
   lib/batik-xml-1.7.jar,
   lib/c3p0-0.9.2.jar,
-  lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,
-  lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-io-3.3.0-SNAPSHOT.jar,
-  lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-model-3.3.0-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,
-  lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-print-3.3.0-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,
-  lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-services-3.3.0-SNAPSHOT.jar,
+  lib/cdmlib-commons-3.3.0-sources.jar,
+  lib/cdmlib-commons-3.3.0.jar,
+  lib/cdmlib-ext-3.3.0-sources.jar,
+  lib/cdmlib-ext-3.3.0.jar,
+  lib/cdmlib-io-3.3.0-sources.jar,
+  lib/cdmlib-io-3.3.0.jar,
+  lib/cdmlib-model-3.3.0-sources.jar,
+  lib/cdmlib-model-3.3.0.jar,
+  lib/cdmlib-persistence-3.3.0-sources.jar,
+  lib/cdmlib-persistence-3.3.0.jar,
+  lib/cdmlib-print-3.3.0-sources.jar,
+  lib/cdmlib-print-3.3.0.jar,
+  lib/cdmlib-remote-3.3.0-sources.jar,
+  lib/cdmlib-remote-3.3.0.jar,
+  lib/cdmlib-services-3.3.0-sources.jar,
+  lib/cdmlib-services-3.3.0.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,

diff --combined eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 9a8373a7da0404fab7389b4eead0f8b73a519ef7,2cfa7b94a1746e0b44841c20ce5a76702f34f40b..2061c1cfb09ed8f17ca028f4f37620994736085c
--- 1/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: DataStore Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
- Bundle-Version: 3.3.0.qualifier
+ Bundle-Version: 3.3.0.201401161011
  Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
  Bundle-Vendor: EDIT
  Export-Package: eu.etaxonomy.cdm,
@@@ -30,8 -30,6 +30,8 @@@
   eu.etaxonomy.taxeditor.store.internal,
   eu.etaxonomy.taxeditor.store.operations,
   eu.etaxonomy.taxeditor.ui.bar,
 + eu.etaxonomy.taxeditor.ui.campanula.derivatesearch,
 + eu.etaxonomy.taxeditor.ui.campanula.specimenSearch,
   eu.etaxonomy.taxeditor.ui.combo,
   eu.etaxonomy.taxeditor.ui.dialog,
   eu.etaxonomy.taxeditor.ui.dialog.selection,