merge-update from trunk

diff --combined .gitattributes
index f3f5fbba04d14c1d836371a0c5d051fcad8961ee,77114bc1e5f153e621220ce34e56b46d6e1fa851..e84077c200c55774e711acdff9e0f8712fb8185a
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -6,7 -6,6 +6,6 @@@ eu.etaxonomy.taxeditor.application/.pro
  eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF -text
  eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin.properties -text
  eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_de.properties -text
- eu.etaxonomy.taxeditor.application/OSGI-INF/l10n/plugin_en.properties -text
  eu.etaxonomy.taxeditor.application/about.mappings -text
  eu.etaxonomy.taxeditor.application/build.properties -text
  eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif -text
@@@ -48,7 -47,8 +47,8 @@@ eu.etaxonomy.taxeditor.bulkeditor/.proj
  eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF -text
  eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle.properties -text
  eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_de.properties -text
- eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/bundle_en.properties -text
+ eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages.properties -text
+ eu.etaxonomy.taxeditor.bulkeditor/OSGI-INF/l10n/messages_de.properties -text
  eu.etaxonomy.taxeditor.bulkeditor/build.properties -text
  eu.etaxonomy.taxeditor.bulkeditor/icons/merge_candidate.gif -text
  eu.etaxonomy.taxeditor.bulkeditor/icons/merge_target.gif -text
@@@ -98,6 -98,7 +98,7 @@@ eu.etaxonomy.taxeditor.bulkeditor/src/m
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/BulkEditorInputType.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java -text
+ eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/Messages.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java -text
  eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java -text
@@@ -354,7 -355,6 +355,6 @@@ eu.etaxonomy.taxeditor.editor/.project 
  eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF -text
  eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties -text
  eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties -text
- eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties -text
  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
@@@ -365,16 -365,7 +365,16 @@@ eu.etaxonomy.taxeditor.editor/icons/edi
  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/pherogram-insert-left-16x16.png -text
 +eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-left-disabled-16x16.png -text
 +eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-16x16.png -text
 +eu.etaxonomy.taxeditor.editor/icons/pherogram-insert-right-disabled-16x16.png -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
@@@ -400,24 -391,13 +400,23 @@@ 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/FixClassificationHierarchyHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditSequenceHandler.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/OpenAlignmentEditorHandler.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/ShowPherogramHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SpecimenPropertyTester.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/alignmenteditor/CreateConsensusSequenceHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ReverseComplementHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleInsertOverwriteHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/ToggleLeftRightInsertionHandler.java -text
 +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/alignmenteditor/UpdateConsensusSequenceHandler.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
@@@ -445,12 -425,6 +444,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
@@@ -639,10 -613,7 +638,10 @@@ eu.etaxonomy.taxeditor.editor/src/main/
  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
@@@ -962,10 -933,8 +961,8 @@@ eu.etaxonomy.taxeditor.navigation/.proj
  eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF -text
  eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties -text
  eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties -text
- eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_en.properties -text
  eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/messages.properties -text
  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
@@@ -1009,6 -978,7 +1006,7 @@@ eu.etaxonomy.taxeditor.navigation/src/m
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/dnd/TaxonNavigatorDragAdapterAssistant.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java -text
  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/CreateClassificationHierarchyHandler.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
@@@ -1023,6 -993,7 +1021,7 @@@ eu.etaxonomy.taxeditor.navigation/src/m
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/EditClassificationOperation.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateClassification.java -text
+ eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateNewTaxonHierarchyOperation.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreatePolytomousKey.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java -text
  eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/Messages.java -text
@@@ -1044,7 -1015,6 +1043,6 @@@ eu.etaxonomy.taxeditor.printpublisher/.
  eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF -text
  eu.etaxonomy.taxeditor.printpublisher/OSGI-INF/l10n/bundle.properties -text
  eu.etaxonomy.taxeditor.printpublisher/OSGI-INF/l10n/bundle_de.properties -text
- eu.etaxonomy.taxeditor.printpublisher/OSGI-INF/l10n/bundle_en.properties -text
  eu.etaxonomy.taxeditor.printpublisher/build.properties -text
  eu.etaxonomy.taxeditor.printpublisher/p2.inf -text
  eu.etaxonomy.taxeditor.printpublisher/plugin.xml -text
@@@ -1071,10 -1041,8 +1069,8 @@@ eu.etaxonomy.taxeditor.store/.project -
  eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF -text
  eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle.properties -text
  eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_de.properties -text
- eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/bundle_en.properties -text
  eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties -text
  eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties -text
- eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_en.properties -text
  eu.etaxonomy.taxeditor.store/build.properties -text
  eu.etaxonomy.taxeditor.store/icons/256color_16x16.bmp -text
  eu.etaxonomy.taxeditor.store/icons/256color_32x32.bmp -text
@@@ -1098,6 -1066,7 +1094,7 @@@ eu.etaxonomy.taxeditor.store/icons/alt_
  eu.etaxonomy.taxeditor.store/icons/amplification_derivate-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/applications-office.png -text
  eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/artwork_derivate_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/autonym_no_bg.gif -text
  eu.etaxonomy.taxeditor.store/icons/back.gif -text
  eu.etaxonomy.taxeditor.store/icons/basionym.gif -text
@@@ -1124,7 -1093,9 +1121,9 @@@ eu.etaxonomy.taxeditor.store/icons/dele
  eu.etaxonomy.taxeditor.store/icons/delete_edit.gif -text
  eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/detail_image_derivate-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/detail_image_derivate_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/dna_derivate_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/eclipse.gif -text
  eu.etaxonomy.taxeditor.store/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.store/icons/edit_16x16.ico -text
@@@ -1133,6 -1104,7 +1132,7 @@@ eu.etaxonomy.taxeditor.store/icons/erro
  eu.etaxonomy.taxeditor.store/icons/expandAll.jpg -text
  eu.etaxonomy.taxeditor.store/icons/export.gif -text
  eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/fieldunit_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/file_obj.gif -text
  eu.etaxonomy.taxeditor.store/icons/filter.gif -text
  eu.etaxonomy.taxeditor.store/icons/flat.gif -text
@@@ -1161,6 -1133,7 +1161,7 @@@ eu.etaxonomy.taxeditor.store/icons/larg
  eu.etaxonomy.taxeditor.store/icons/leaf_detail.png -text
  eu.etaxonomy.taxeditor.store/icons/linkto_help.gif -text
  eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/living_plant_photo_derivate_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/lock.png -text
  eu.etaxonomy.taxeditor.store/icons/lock_open.png -text
  eu.etaxonomy.taxeditor.store/icons/lockedstate.gif -text
@@@ -1207,7 -1180,9 +1208,9 @@@ eu.etaxonomy.taxeditor.store/icons/sing
  eu.etaxonomy.taxeditor.store/icons/smartmode_co.gif -text
  eu.etaxonomy.taxeditor.store/icons/sort.gif -text
  eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/specimen_derivate_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/step_done.gif -text
  eu.etaxonomy.taxeditor.store/icons/swap.gif -text
  eu.etaxonomy.taxeditor.store/icons/swap2.gif -text
@@@ -1222,6 -1197,7 +1225,7 @@@ eu.etaxonomy.taxeditor.store/icons/thin
  eu.etaxonomy.taxeditor.store/icons/thin_max_view.gif -text
  eu.etaxonomy.taxeditor.store/icons/thin_restore_view.GIF -text
  eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png -text
+ eu.etaxonomy.taxeditor.store/icons/tissue_sample_data-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/trash.gif -text
  eu.etaxonomy.taxeditor.store/icons/tree_icon_small.jpg -text
  eu.etaxonomy.taxeditor.store/icons/undo.gif -text
@@@ -1239,6 -1215,7 +1243,7 @@@ eu.etaxonomy.taxeditor.store/p2.inf -te
  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/Messages.java -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
@@@ -1250,7 -1227,6 +1255,6 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/dnd/CdmAuthorityTableDropTargetListener.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/dnd/transfer/TaxonNodeTransfer.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/ISecuredEditor.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/UsageTermCollection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDragListener.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermDropAdapter.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/DefinedTermEditor.java -text
@@@ -1293,6 -1269,8 +1297,8 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  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/CsvNameExportWizard.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/CsvPrintExportWizard.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
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExcelNormalExplicitTaxaImportWizard.java -text
@@@ -1436,10 -1414,13 +1442,13 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UsageTermCollection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/bar/AuthenticatedUserBar.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/VocabularyComboElement.java -text
  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
@@@ -1591,6 -1572,7 +1600,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/ScopeSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateModifierElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/AbstractDetailedDescriptionDetailElement.java -text
@@@ -1617,7 -1599,6 +1627,6 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  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
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java -text
@@@ -1683,6 -1664,7 +1692,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventWizardPage.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeoScopeDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/IDerivedUnitFacadeDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/NamedAreaDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/OriginalLabelDataSection.java -text
@@@ -1777,9 -1759,16 +1787,16 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/FeatureDetailElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitCollectionElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitCollectionSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/NamedAreaLevelDetailSection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateModifierCollectionSection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionSection.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StatisticalMeasureCollectionElement.java -text
+ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StatisticalMeasureCollectionSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/TermVocabularyDetailSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java -text
@@@ -1804,7 -1793,6 +1821,6 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewPart.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmDataSourceViewerComparator.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/CdmMetaDataAwareDataSourceContainer.java -text
- eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/Messages.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/AbstractDataSourceHandler.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/CloneDataSourceHandler.java -text

diff --combined eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 54ae0db6fcb650ca4e313e0ffb8ac368a7db82b6,1aa565a0c981a2a90702e48179db6b8fb672df5a..854759021135d5a6652f588293e363a84552cd91
--- 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.5.1.qualifier
+ Bundle-Version: 3.5.2.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
  Bundle-Vendor: %Bundle-Vendor.0
  Bundle-Localization: OSGI-INF/l10n/plugin
@@@ -177,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 8486515b2a719bb63c86aba7ec0bedd557e03de8,51792637faccc249bf51af76837e830741d53322..4d1348ccd3eab89dddb71eb7ae28c6773f567c86
--- 1/eu.etaxonomy.taxeditor.editor/build.properties
--- 2/eu.etaxonomy.taxeditor.editor/build.properties
+++ b/eu.etaxonomy.taxeditor.editor/build.properties
@@@ -6,12 -6,4 +6,11 @@@ bin.includes = META-INF/,
                 icons/,\
                 p2.inf,\
                 OSGI-INF/l10n/plugin.properties,\
 -               OSGI-INF/l10n/plugin_de.properties
 +               OSGI-INF/l10n/plugin_de.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 f0a093796a8d2e088e452e89f4f09dd15b4355ea,98e9b29db321ea5ed81a431a87ce6ecfa6e63771..84899076bdeaf670009593da0323f45d62431d09
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -83,15 -83,8 +83,15 @@@
              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"
@@@ -159,15 -152,9 +159,15 @@@
                 id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
                 name="%view.name.6">
           </view>
 +         <view
 +               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="%extension.name.0" id="eu.etaxonomy.taxeditor.markers.validationerror">
                <super type="org.eclipse.core.resources.problemmarker"/>
                <attribute name="databaseId"/>
@@@ -239,7 -226,8 +239,7 @@@
                        name="%marker.field.7">
                </markerField>
        </extension>
 -      
 -  <extension
 +   <extension
           point="org.eclipse.ui.elementFactories">
        <factory
              class="eu.etaxonomy.taxeditor.editor.TaxonEditorInputFactory"
@@@ -337,11 -325,6 +337,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">
@@@ -540,6 -523,16 +540,16 @@@
                 </reference>
              </visibleWhen>
           </command>
+          <command
+                   commandId="eu.etaxonomy.taxeditor.editor.name.moveSynonymToAnotherAcceptedTaxon"
+                   label="%command.label.56"
+                   style="push">
+                <visibleWhen>
+                    <reference
+                          definitionId="isSynonym">
+                    </reference>
+                 </visibleWhen>
+           </command>
           <separator
                 name="taxeditor-editor.separator3"
                 visible="true">
@@@ -659,12 -652,12 +669,12 @@@
              <visibleWhen
                    checkEnabled="true">
                 <and>
 -                  <with
 -                        variable="selection">
 -                     <count
 -                           value="+">
 -                     </count>
 -                  </with>
 +               <with
 +                     variable="selection">
 +                  <count
 +                        value="+">
 +                  </count>
 +               </with>
                    <reference
                          definitionId="isIndividualsAssociation">
                    </reference>
@@@ -738,28 -731,6 +748,28 @@@
                 label="%command.label.54"
                 style="push">
           </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.editor.editSequence"
 +               label="Edit Sequence"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isSequence">
 +               </reference>
 +            </visibleWhen>
 +         </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.editor.showPherogram"
 +               label="Show Pherogram"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isSingleRead">
 +               </reference>
 +            </visibleWhen>
 +         </command>
           <dynamic
                 class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
                 id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
@@@ -977,62 -948,6 +987,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"
 +                  icon="icons/pherogram-insert-left-16x16.png"
 +                  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">
@@@ -1174,18 -1089,6 +1184,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"
@@@ -1215,18 -1118,6 +1225,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.FixClassificationHierarchyHandler"
-             commandId="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler">
-       </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.editor.handler.alignmenteditor.ToggleInsertOverwriteHandler"
 +            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleInsertOverwrite">
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.editor.handler.alignmenteditor.ToggleLeftRightInsertionHandler"
 +            commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.toggleLeftRightInsertion">
 +      </handler>
     </extension>
     <extension
           name="%extension.name"
@@@ -1293,6 -1184,12 +1299,12 @@@
              defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SwapSynonymAndAcceptedHandler"
              id="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted"
              name="%command.name.6">
+       </command>
+        <command
+             categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
+             defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.MoveSynonymToAnotherAcceptedTaxonHandler"
+             id="eu.etaxonomy.taxeditor.editor.name.moveSynonymToAnotherAcceptedTaxon"
+             name="%command.name.46">
        </command>
        <command
              categoryId="eu.etaxonomy.taxeditor.editor.taxon.name.command.category"
@@@ -1499,34 -1396,17 +1511,34 @@@
               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.OpenAlignmentEditorHandler"
 +            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="%command.name.41">
        </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"
@@@ -1553,21 -1433,6 +1565,16 @@@
              id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
              name="%command.name.44">
        </command>
-       <command
-             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
-             id="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
-             name="%command.name.45">
-       </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.EditSequenceHandler"
 +            id="eu.etaxonomy.taxeditor.editor.editSequence"
 +            name="Edit Sequence">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.ShowPherogramHandler"
 +            id="eu.etaxonomy.taxeditor.editor.showPherogram"
 +            name="Show Pherogram">
 +      </command>
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">
@@@ -1733,24 -1598,6 +1740,24 @@@
              </test>
           </with>
        </definition>
 +      <definition
 +            id="isSequence">
 +         <with
 +               variable="selection">
 +            <test
 +                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSequence">
 +            </test>
 +         </with>
 +      </definition>
 +      <definition
 +            id="isSingleRead">
 +         <with
 +               variable="selection">
 +            <test
 +                  property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleRead">
 +            </test>
 +         </with>
 +      </definition>
     </extension>
     <extension
           point="org.eclipse.core.expressions.propertyTesters">
@@@ -1775,13 -1622,6 +1782,13 @@@
              properties="isGroup"
              type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
        </propertyTester>
 +      <propertyTester
 +            class="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
 +            id="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
 +            namespace="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
 +            properties="isSequence,isSingleRead"
 +            type="org.eclipse.jface.viewers.IStructuredSelection">
 +      </propertyTester>
     </extension>
     <extension
           point="org.eclipse.ui.bindings">   
@@@ -1790,11 -1630,6 +1797,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">