merge-update from trunk

diff --cc .gitattributes
index f3f5fbba04d14c1d836371a0c5d051fcad8961ee,77114bc1e5f153e621220ce34e56b46d6e1fa851..e84077c200c55774e711acdff9e0f8712fb8185a
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -400,10 -391,6 +400,9 @@@ 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

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

diff --cc 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 --cc 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
@@@ -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"
@@@ -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">