merge-update from trunk

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
index 9ec51237dcaed31ab59ceb8d58ff7590191a56a7,8c6eecf5d0914a2e79890fb617f4fe9864158753..a93272a31a03c0dc4708c9e2d2f048481e11a755
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaViewPart.java
@@@ -28,10 -27,9 +28,11 @@@ import org.eclipse.ui.IEditorPart
  import org.eclipse.ui.IWorkbenchActionConstants;
  import org.eclipse.ui.IWorkbenchPart;
  
+ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
  import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 +import eu.etaxonomy.taxeditor.editor.EditorUtil;
  import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
 +import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
  import eu.etaxonomy.taxeditor.model.AbstractUtility;
  import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
  import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;