merge-update from trunk

diff --cc eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index 4a9ba723cfe9e7169ab08d1bfec65943b4e05a23,badb788a271b364d983cd101e780f88742000615..b1c2cf9615db35b9076dfb117a667a5a29857ab8
--- 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.2.3.201308261400
+ Bundle-Version: 3.2.4.qualifier
  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 --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
Simple merge

diff --cc eu.etaxonomy.taxeditor.cdmlib/build.properties
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
Simple merge