merge-update from trunk

diff --combined .gitattributes
index 8674896df85fea719f9b3c424423335447c78c53,292f101cf9512954698985d661e6b37aee591019..f62d61671fdb7c2b97cd9e393a16e5b151602bf7
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -13,6 -13,7 +13,7 @@@ eu.etaxonomy.taxeditor.application/icon
  eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif -text
  eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif -text
  eu.etaxonomy.taxeditor.application/icons/256color_48x48.ico -text
+ eu.etaxonomy.taxeditor.application/icons/check.png -text
  eu.etaxonomy.taxeditor.application/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png -text
  eu.etaxonomy.taxeditor.application/plugin.xml -text
@@@ -31,6 -32,7 +32,7 @@@ eu.etaxonomy.taxeditor.application/src/
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/SaveHandler.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/BulkEditing.java -text
+ eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/ChecklistPerspective.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Default.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/DerivatePerspective.java -text
  eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/PolytomousKey.java -text
@@@ -80,7 -82,6 +82,6 @@@ eu.etaxonomy.taxeditor.bulkeditor/src/m
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorViewerConfiguration.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/IBulkEditorConstants.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/IBulkEditorSortProvider.java -text
- eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/PropertyTester.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DeleteObjectContributionItem.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java -text
@@@ -357,22 -358,20 +358,25 @@@ eu.etaxonomy.taxeditor.editor/OSGI-INF/
  eu.etaxonomy.taxeditor.editor/build.properties -text
  eu.etaxonomy.taxeditor.editor/icons/address-book-new.png -text
  eu.etaxonomy.taxeditor.editor/icons/camera-photo.png -text
+ eu.etaxonomy.taxeditor.editor/icons/check.png -text
+ eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png -text
  eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text
  eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
  eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
  eu.etaxonomy.taxeditor.editor/icons/link_obj.gif -text
  eu.etaxonomy.taxeditor.editor/icons/xper64.png -text
 +eu.etaxonomy.taxeditor.editor/lib/biojava3-alignment-3.0.7.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/biojava3-core-3.0.7.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/commons-lang3-3.1.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/core-1.8.5.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/sequencing-1.8.5.jar -text
  eu.etaxonomy.taxeditor.editor/p2.inf -text
  eu.etaxonomy.taxeditor.editor/plugin.xml -text
  eu.etaxonomy.taxeditor.editor/pom.xml -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/CdmDataTransfer.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/ChooseFromMultipleTaxonNodesDialog.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorCdmViewer.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/IDropTargetable.java -text
@@@ -392,15 -391,13 +396,17 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditNewTaxonHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/LoadPherogramHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenAlignmentEditor.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenTaxonEditorHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveTaxonHandler.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/TaxonParameterConverter.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/ToggleInsertOverwriteHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/ToggleLeftRightInsertionHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewNameHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewPersonHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewReferenceHandler.java -text
@@@ -428,12 -425,6 +434,12 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/CreateNodeOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RefreshNodeNumberingOperation.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditorInput.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/CDMAlignmentObjectPlaceholder.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/ContigSequenceDataProvider.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramMouseListener.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/PherogramViewPart.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroup.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java -text
@@@ -489,8 -480,12 +495,12 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonBaseOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveSynonymToAnotherAcceptedTaxonOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/RemoveHomotypicalGroupBasionymOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/MarkerManager.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationContextListener.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationDaemon.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistContentProvider.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditor.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorComparator.java -text
@@@ -547,7 -542,6 +557,6 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java -text
- eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDragListener.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDropListener.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java -text
@@@ -556,6 -550,7 +565,7 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/SingleReadSequenceContextMenu.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/DeleteDerivateHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/OpenDerivateEditorForTaxonHandler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java -text
@@@ -580,6 -575,7 +590,7 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateSpecimenDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteSpecimenDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/EditInXper2Handler.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java -text
@@@ -608,10 -604,16 +619,19 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java -text
  eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityClassMarkerField.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/EntityIdMarkerField.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/InvalidValueMarkerField.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyDescriptionMarkerField.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyFieldNameMarkerField.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/UserFriendlyTypeNameMarkerField.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidationProblemsView.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorClassMarkerField.java -text
+ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/validation/ValidatorMessageMarkerField.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1 -text
 +eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1 -text
  eu.etaxonomy.taxeditor.editor/src/main/resources/TaonDescriptionEditor.screen -text
 +eu.etaxonomy.taxeditor.editor/src/main/resources/TestPherogram_qualityScore.scf -text
  eu.etaxonomy.taxeditor.editor/src/main/resources/log4j.properties -text
  eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/Application.java -text
  eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/ApplicationActionBarAdvisor.java -text
@@@ -934,6 -936,7 +954,7 @@@ eu.etaxonomy.taxeditor.navigation/OSGI-
  eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/messages_de.properties -text
  eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/messages_en.properties -text
  eu.etaxonomy.taxeditor.navigation/build.properties -text
+ eu.etaxonomy.taxeditor.navigation/icons/check.png -text
  eu.etaxonomy.taxeditor.navigation/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.navigation/icons/preferences-system-windows.png -text
  eu.etaxonomy.taxeditor.navigation/icons/system-search.png -text
@@@ -977,10 -980,12 +998,12 @@@ eu.etaxonomy.taxeditor.navigation/src/m
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java -text
+ eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveFactualDataHandler.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewTaxonNodeHandler.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/RefreshTreeHandler.java -text
+ eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/TaxonParameterConverter.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java -text
@@@ -1202,6 -1207,7 +1225,7 @@@ eu.etaxonomy.taxeditor.store/icons/web.
  eu.etaxonomy.taxeditor.store/p2.inf -text
  eu.etaxonomy.taxeditor.store/plugin.xml -text
  eu.etaxonomy.taxeditor.store/pom.xml -text
+ eu.etaxonomy.taxeditor.store/schema/eu.etaxonomy.taxeditor.store.cdmViewer.exsd -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceCredentialsWizardPage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/wizard/CdmDataSourceH2WizardPage.java -text
@@@ -1254,6 -1260,7 +1278,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExcelImportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractExportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ClassificationChooserWizardPage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/CsvExportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/DarwinCoreArchiveExportWizard.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/EndnoteImportWizard.java -text
@@@ -1290,6 -1297,7 +1315,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ICdmEditorHandle.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IContextListener.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadePart.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDirtyMarkable.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IElementHasDetails.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java -text
@@@ -1311,8 -1319,6 +1337,6 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TimeHelper.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationCloningWizardPage.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGelPhotoWizardPage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGeneralWizardPage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java -text
@@@ -1343,12 -1349,12 +1367,12 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/CdmPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/ChecklistEditorGeneralPreference.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultLanguageEditorPreferencePage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DescriptionPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/FeatureTreePreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclaturalCodePrefDialog.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageEditorPreferencePage.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguageRepresentationPreferencePage.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MatchingPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MediaPreferences.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/MobotOpenUrlPreferences.java -text
@@@ -1406,6 -1412,10 +1430,10 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/DefaultLanguageDialog.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/LoginDialog.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteConfiguratorComposite.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteConfiguratorDialog.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteSpecimenConfiguratorComposite.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/deleteConfigurator/DeleteTaxonConfiguratorComposite.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java -text
@@@ -1482,7 -1492,6 +1510,6 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/DerivedUnitGeneralDetailElementMVC.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/GeographicPointElement.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataField.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java -text
@@@ -1575,6 -1584,8 +1602,8 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailSection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/identifier/IdentifierDetailElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/identifier/IdentifierDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/GeographicalScopeDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailSection.java -text
@@@ -1624,8 -1635,6 +1653,6 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseWizardPage.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailElement.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitFacadeDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralWizardPage.java -text
@@@ -1649,6 -1658,10 +1676,10 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenHierarchyDetailElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenHierarchyDetailSection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/TaxonAssociationDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenAbstractDeterminationEventDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenCurrentDeterminationDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java -text
@@@ -1753,6 -1766,8 +1784,8 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmEditorViewPart.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractCdmViewPart.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/AbstractSplitableViewPart.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerChooser.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/ICdmViewer.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceContentProvider.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceLabelProvider.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java -text
@@@ -1768,6 -1783,7 +1801,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/DeleteDataSourceHandler.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/EditDataSourceHandler.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateContentProvider.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java -text

diff --combined eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index dc6052e58354e72374afe2c06509a278c4609b13,144fd8b310f6cf42d6eb78988123299647288844..b32930830c8c9837c487d698b54862ccfe89373b
--- 1/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Editor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
- Bundle-Version: 3.4.0.qualifier
+ Bundle-Version: 3.4.1.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
  Bundle-Vendor: %Bundle-Vendor.0
  Bundle-Localization: OSGI-INF/l10n/plugin
@@@ -11,6 -11,7 +11,7 @@@ Export-Package: eu.etaxonomy.taxeditor.
   eu.etaxonomy.taxeditor.editor.internal,
   eu.etaxonomy.taxeditor.editor.name,
   eu.etaxonomy.taxeditor.editor.name.handler,
+  eu.etaxonomy.taxeditor.editor.view.concept,
   eu.etaxonomy.taxeditor.editor.view.dataimport,
   eu.etaxonomy.taxeditor.editor.view.descriptive,
   eu.etaxonomy.taxeditor.editor.view.media,
@@@ -23,7 -24,8 +24,8 @@@ Require-Bundle: org.eclipse.ui
   eu.etaxonomy.taxeditor.bulkeditor,
   org.eclipse.zest.core,
   org.eclipse.zest.layouts,
-  eu.etaxonomy.taxeditor.cdmlib
+  eu.etaxonomy.taxeditor.cdmlib,
+  org.eclipse.ui.ide;bundle-version="3.7.0"
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
  Bundle-ActivationPolicy: lazy
  Import-Package: org.eclipse.core.databinding.beans,
@@@ -175,11 -177,4 +177,11 @@@ Bundle-ClassPath: .
   jdimodel.jar,
   pdebuild.jar,
   compatibility.jar,
 - junit.jar
 + junit.jar,
 + lib/biojava3-alignment-3.0.7.jar,
 + lib/biojava3-core-3.0.7.jar,
 + lib/core-1.8.5.jar,
 + lib/sequencing-1.8.5.jar,
 + lib/bioinfweb.commons/,
 + lib/LibrAlign/,
 + lib/commons-lang3-3.1.jar

diff --combined eu.etaxonomy.taxeditor.editor/build.properties
index 91b72a915f0fd3b88450f0d7c20155a94c86664a,df9378660517f9cd598aab37f9da0413890e85c1..8486515b2a719bb63c86aba7ec0bedd557e03de8
--- 1/eu.etaxonomy.taxeditor.editor/build.properties
--- 2/eu.etaxonomy.taxeditor.editor/build.properties
+++ b/eu.etaxonomy.taxeditor.editor/build.properties
@@@ -3,15 -3,8 +3,15 @@@ source.. = src/main/java/,
  bin.includes = META-INF/,\
                 .,\
                 plugin.xml,\
-                OSGI-INF/l10n/plugin.properties,\
                 icons/,\
                 p2.inf,\
+                OSGI-INF/l10n/plugin.properties,\
                 OSGI-INF/l10n/plugin_de.properties,\
 -               OSGI-INF/l10n/plugin_en.properties
 +               OSGI-INF/l10n/plugin_en.properties,\
 +               lib/biojava3-alignment-3.0.7.jar,\
 +               lib/biojava3-core-3.0.7.jar,\
 +               lib/core-1.8.5.jar,\
 +               lib/sequencing-1.8.5.jar,\
 +               lib/bioinfweb.commons/,\
 +               lib/LibrAlign/,\
 +               lib/commons-lang3-3.1.jar

diff --combined eu.etaxonomy.taxeditor.editor/plugin.xml
index 03d06d1ad565161771ac4752f995383fb298ce60,53080cc47d69177e2a1509e581dcb603f1e19765..99f70453118a991826507087998fcafb714460ba
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -79,19 -79,12 +79,19 @@@
        </editor>
           <editor
              class="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
-             icon="icons/address-book-new.png"
+             icon="icons/check.png"
              id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
              name="%editor.name.8">
        </editor>
 +      <editor
 +            class="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
 +            default="false"
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
 +            name="Alignment Editor">
 +      </editor>
     </extension>
        <extension
 +            id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
              point="org.eclipse.ui.views">
           <view
                 allowMultiple="false"
@@@ -152,14 -145,89 +152,86 @@@
                 name="%view.name.5">
           </view>
           <view
 -               allowMultiple="false"
 -               category="eu.etaxonomy.taxeditor.editor.category"
 -               class="eu.etaxonomy.taxeditor.editor.view.validation.ValidationProblemsView"
 -               icon="icons/edit_16x16.gif"
 -               id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
 -               name="%view.name.6">
 +               allowMultiple="true"
 +               class="eu.etaxonomy.taxeditor.editor.molecular.PherogramViewPart"
 +               id="eu.etaxonomy.taxeditor.editor.molecular.PherogramView"
 +               name="PherogramView"
 +               restorable="true">
           </view>
        </extension>
 -      
 -      <!-- VALIDATION RELATED STUFF -->
++      <!-- VALIDATION RELATED STUFF -->
+       <extension point="org.eclipse.core.resources.markers" name="Validation Error" id="eu.etaxonomy.taxeditor.markers.validationerror">
+               <super type="org.eclipse.core.resources.problemmarker"/>
+               <attribute name="databaseId"/>
+               <attribute name="userFriendlyTypeName"/>
+               <attribute name="userFriendlyDescription"/>
+               <attribute name="userFriendlyFieldName"/>
+               <attribute name="validatorMessage"/>
+               <attribute name="invalidValue"/>
+               <attribute name="validatorClass"/>
+               <attribute name="entityClass"/>
+               <attribute name="entityId"/>
+               <persistent value="false"/>
+       </extension>
+ 
+       <extension point="org.eclipse.ui.ide.markerSupport">
+           <markerContentGenerator
+                   id="eu.etaxonomy.taxeditor.editor.validation.ValidationProblemsMarkerGenerator" 
+                   name="Validation Problems Marker Generator">  
+               <markerTypeReference id="eu.etaxonomy.taxeditor.markers.validationerror" />
+               
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyDescription" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyFieldName" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.validatorMessage" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.invalidValue" visible="true" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.validatorClass" visible="false" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.entityClass" visible="false" />
+               <markerFieldReference id="eu.etaxonomy.taxeditor.markers.validation.entityId" visible="false" />
+           </markerContentGenerator>
+           
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyTypeNameMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyTypeName"
+                       name="%marker.field.0">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyDescriptionMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyDescription"
+                       name="%marker.field.1">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.UserFriendlyFieldNameMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.userFriendlyFieldName"
+                       name="%marker.field.2 = Attribute">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.InvalidValueMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.invalidValue"
+                       name="%marker.field.3 = Problematic Value">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorMessageMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.validatorMessage"
+                       name="%marker.field.4 = Problem description">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.ValidatorClassMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.validatorClass"
+                       name="%marker.field.5">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.EntityClassMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.entityClass"
+                       name="%marker.field.6">
+               </markerField>
+               <markerField
+                       class="eu.etaxonomy.taxeditor.editor.view.validation.EntityIdMarkerField"
+                       id="eu.etaxonomy.taxeditor.markers.validation.entityId"
+                       name="%marker.field.7">
+               </markerField>
+       </extension>
 -      
 -  <extension
 +   <extension
           point="org.eclipse.ui.elementFactories">
        <factory
              class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
@@@ -257,11 -325,6 +329,11 @@@
                 </reference>
              </visibleWhen>
           </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +               label="Alignment Editor"
 +               style="push">
 +         </command>
        </menuContribution>
        <menuContribution
              locationURI="menu:org.eclipse.ui.main.menu.navigate">
@@@ -572,6 -635,20 +644,20 @@@
                 name="taxeditor-editor.separator1"
                 visible="true">
           </separator>
+          <command
+                commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
+                label="Open in Derivate Editor"
+                style="push">
+             <visibleWhen
+                   checkEnabled="true">
+                <with
+                      variable="selection">
+                   <count
+                         value="+">
+                   </count>
+                </with>
+             </visibleWhen>
+          </command>
           <command
                 commandId="eu.etaxonomy.taxeditor.editor.commands.description.moveDescriptionToTaxon"
                 label="%command.label.28"
@@@ -617,6 -694,9 +703,9 @@@
                 label="%command.label.31"
                 style="push">
           </command>
+          <separator
+                name="eu.etaxonomy.taxeditor.editor.separator1">
+          </separator>
        </menuContribution>
        <menuContribution
              locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
@@@ -629,6 -709,17 +718,17 @@@
                 label="Delete"
                 style="push">
           </command>
+          <command
+                commandId="eu.etaxonomy.taxeditor.editor.derivate.createFieldUnit"
+                label="Create Field Unit"
+                style="push">
+          </command>
+          <command
+                commandId="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
+                icon="icons/deep-delete-16x16-32.png"
+                label="Delete (with children)"
+                style="push">
+          </command>
        </menuContribution>
        <menuContribution
              locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
@@@ -842,62 -933,6 +942,62 @@@
              </visibleWhen>
           </command>
        </menuContribution>
 +      <menuContribution
 +            allPopups="false"
 +            locationURI="menu:org.eclipse.ui.main.menu">
 +         <menu
 +               label="Alignment Editor">
 +            <command
 +                  commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
 +                  label="Load Pherogram"
 +                  style="push">
 +            </command>
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <with
 +                     variable="activePartId">
 +                  <equals
 +                        value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
 +                  </equals>
 +               </with>
 +            </visibleWhen>
 +         </menu>
 +      </menuContribution>
 +      <menuContribution
 +            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=eu.etaxonomy.taxeditor.navigation.search.toolbar">
 +         <toolbar
 +               id="eu.etaxonomy.taxeditor.editor.alignmentToolbar">
 +            <command
 +                  commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite"
 +                  label="Toggle insert/overwrite"
 +                  style="push">
 +               <visibleWhen
 +                     checkEnabled="true">
 +                  <with
 +                        variable="activePartId">
 +                     <equals
 +                           value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
 +                     </equals>
 +                  </with>
 +               </visibleWhen>
 +            </command>
 +            <command
 +                  commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion"
 +                  label="Toggle left/right insertion"
 +                  style="push">
 +               <visibleWhen
 +                     checkEnabled="true">
 +                  <with
 +                        variable="activePartId">
 +                     <equals
 +                           value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
 +                     </equals>
 +                  </with>
 +               </visibleWhen>
 +            </command>
 +         </toolbar>
 +      </menuContribution>
 +      
        <menuContribution
              allPopups="false"
              locationURI="toolbar:eu.etaxonomy.taxeditor.editor.view.descriptive">
@@@ -915,12 -950,39 +1015,39 @@@
                 commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
                 label="Open Associated Derivates"
                 style="push">
+             <visibleWhen
+                   checkEnabled="false">
+                <and>
+                   <reference
+                         definitionId="isCdmStoreConnected">
+                   </reference>
+                   <reference
+                         definitionId="isTaxonNode">
+                   </reference>
+                </and>
+             </visibleWhen>
           </command>
           <separator
                 name="eu.etaxonomy.taxeditor.editor.separator1"
                 visible="true">
           </separator>
        </menuContribution>
+       <menuContribution
+             locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+          <separator
+                name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
+                visible="true">
+          </separator>
+          <command
+                commandId="org.eclipse.ui.views.showView"
+                label="%command.name.40"
+                style="push">
+             <parameter
+                   name="org.eclipse.ui.views.showView.viewId"
+                   value="eu.etaxonomy.taxeditor.editor.view.validation.problems">
+             </parameter>
+          </command>
+       </menuContribution>
     </extension>
     <extension
           point="org.eclipse.ui.handlers">
@@@ -1012,18 -1074,6 +1139,18 @@@
        <handler
              class="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
              commandId="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler">
 +      </handler>
 +            <handler
 +            class="eu.etaxonomy.taxeditor.editor.handler.LoadPherogramHandler"
 +            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram">
 +         <activeWhen>
 +            <with
 +                  variable="activePartId">
 +               <equals
 +                     value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
 +               </equals>
 +            </with>
 +         </activeWhen>
        </handler>
        <handler
              class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
@@@ -1053,14 -1103,6 +1180,14 @@@
              class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
              commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
        </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.editor.handler.ToggleInsertOverwriteHandler"
 +            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite">
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.editor.handler.ToggleLeftRightInsertionHandler"
 +            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion">
 +      </handler>
     </extension>
     <extension
           name="%extension.name"
@@@ -1333,35 -1375,43 +1460,61 @@@
               defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
               id="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler"
               name="%command.name.38">
 -       </command>
 +      </command>
        <command
              categoryId="eu.etaxonomy.taxeditor.editor.new.category"
              defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.CreateDataSourceHandler"
              id="eu.etaxonomy.taxeditor.editor.command.new.datasource"
              name="%command.name.39">
        </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +            id="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +            name="Open Alignment Editor">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
 +            name="Load Pherogram">
 +      </command>
        <command
              id="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
              name="Show Only Individual Associations">
        </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite"
 +            name="Toggle insert/overwrite">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion"
 +            name="Toggle left/right insertion in base call sequence">
 +      </command>
+       <command
+             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenTaxonEditorHandler"
+             id="eu.etaxonomy.taxeditor.editor.openTaxonEditor"
+             name="Open Taxon Editor">
+          <commandParameter
+                id="eu.etaxonomy.taxeditor.editor.taxonParameter"
+                name="taxonUUID"
+                optional="false"
+                typeId="eu.etaxonomy.taxeditor.editor.taxonParameterType">
+          </commandParameter>
+       </command>
+       <commandParameterType
+             converter="eu.etaxonomy.taxeditor.editor.handler.TaxonParameterConverter"
+             id="eu.etaxonomy.taxeditor.editor.taxonParameterType"
+             type="eu.etaxonomy.cdm.model.taxon.TaxonBase">
+       </commandParameterType>
+       <command
+             defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.CreateFieldUnitHandler"
+             id="eu.etaxonomy.taxeditor.editor.derivate.createFieldUnit"
+             name="Create Field Unit">
+       </command>
+       <command
+             defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.DeleteDerivateHandler"
+             id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
+             name="Deep Delete">
+       </command>
 +
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">
@@@ -1550,11 -1600,6 +1703,11 @@@
              id="eu.etaxonomy.taxeditor.bindings.scheme.default"
              name="%scheme.name">
        </scheme>
 +      <key
 +            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
 +            schemeId="eu.etaxonomy.taxeditor.bindings.scheme.default"
 +            sequence="M1+O">
 +      </key>
     </extension>
      <extension
           point="org.eclipse.ui.importWizards">
@@@ -1568,4 -1613,10 +1721,10 @@@
           </description>
        </wizard>
     </extension>
+     <extension
+           point="eu.etaxonomy.taxeditor.store.cdmViewer">
+        <cdmViewer
+              class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">
+        </cdmViewer>
+     </extension>
  </plugin>

diff --combined eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 4ed9313d32cf8063e44cccad67ca856f13df9eb9,c9350145261000221c842ae1127f8c5d96779a32..d923dd9b8a7dcb49424471312505a5f04c9853e9
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@@ -27,18 -27,18 +27,20 @@@ import org.eclipse.ui.IEditorReference
  import org.eclipse.ui.PartInitException;
  import org.eclipse.ui.handlers.HandlerUtil;
  
+ import eu.etaxonomy.cdm.api.service.ITaxonService;
  import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
  import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
  import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor;
  import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput;
  import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
  import eu.etaxonomy.taxeditor.editor.key.KeyEditor;
  import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditorInput;
- import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditorInput;
 +import eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor;
 +import eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditorInput;
  import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor;
+ import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditorInput;
  import eu.etaxonomy.taxeditor.editor.view.dataimport.BioCaseEditorInput;
  import eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditor;
  import eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorInput;
@@@ -48,6 -48,8 +50,8 @@@ import eu.etaxonomy.taxeditor.editor.vi
  import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
  import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput;
  import eu.etaxonomy.taxeditor.model.AbstractUtility;
+ import eu.etaxonomy.taxeditor.model.MessagingUtils;
+ import eu.etaxonomy.taxeditor.store.CdmStore;
  
  /**
   * Utility for the editor package
@@@ -118,16 -120,6 +122,16 @@@ public class EditorUtil extends Abstrac
            open(input, ChecklistEditor.ID);
        }
  
 +      /**
 +       * Opens a new AlignmentEditor for the given input
 +       * @param input
 +       * @throws PartInitException
 +       */
 +      public static void open(AlignmentEditorInput input)
 +              throws PartInitException {
 +          open(input, AlignmentEditor.ID);
 +      }
 +
        /**
         * Opens a new {@link DataImportEditor} for the given input
         * @param input a {@link DataImportEditorInput}
@@@ -169,6 -161,11 +173,11 @@@
         */
        public static void openTaxonBase(UUID taxonBaseUuid)
                        throws PartInitException {
+           TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).find(taxonBaseUuid);
+         if (taxonBase != null && taxonBase.isOrphaned()) {
+                 MessagingUtils.warningDialog("Orphaned Taxon", TaxonEditorInput.class, "This is an orphaned taxon i.e. a taxon that is not connected to a classification and not having any taxonomic relationships. Editing of orphaned taxon is currently not supported.");
+                 return;
+         }
                TaxonEditorInput input = TaxonEditorInput
                                .NewInstanceFromTaxonBase(taxonBaseUuid);
                open(input);
@@@ -445,4 -442,15 +454,15 @@@
          }
          return null;
      }
+ 
+     /**
+      * Opens a taxon editor for the given object if the given object is a valid input.
+      * @param object the object for which the editor will be opened
+      * @throws PartInitException
+      */
+     public static void openTaxonEditor(Object object) throws PartInitException {
+         if(object instanceof TaxonBase<?>){
+             openTaxonBase(((TaxonBase<?>) object).getUuid());
+         }
+     }
  }