Merge branch 'develop' into owlExport

# Conflicts:
#	eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
#	eu.etaxonomy.taxeditor.application/plugin.xml

diff --cc eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index e1488f78eb15b99beca9a2e4add7a1f1e2a05017,100ed9bb88364d3e6629e2c60867eca51e06f754..55f052d328f01abea3a599bb0911056274c41167
--- 1/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@@ -31,12 -31,7 +31,13 @@@ Require-Bundle: org.eclipse.ui
   org.eclipse.e4.ui.model.workbench,
   eu.etaxonomy.taxeditor.workbench,
   org.eclipse.e4.ui.di,
 + org.eclipse.e4.core.di.annotations,
 + org.eclipse.emf.ecore,
 + org.eclipse.emf.ecore.xmi;bundle-version="2.12.0",
 + org.eclipse.e4.core.contexts,
 + org.eclipse.e4.core.di;bundle-version="1.6.1",
 + org.eclipse.e4.core.services;bundle-version="2.0.100"
+  org.eclipse.e4.core.di.annotations
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-ActivationPolicy: lazy
  Import-Package: eu.etaxonomy.cdm.database,