merge-update from trunk

diff --cc .gitattributes
index f21637eb4c5d5d53060f3fe31833a7193d8d7e25,f9fd22985109d0ac0c8808770fa110b8f7c6fdac..f1d27f0f893a5808727b1b961cd6117e71d4b4ea
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -396,9 -391,7 +396,10 @@@ 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/EditSequenceHandler.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/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.cdmlib/.classpath
index 2cc9dede15dde187a6a1e10e15c6b450c1fc5311,2cc9dede15dde187a6a1e10e15c6b450c1fc5311..41a7f1b3198fd75534a726f2f07c06b691d9056c
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -201,7 -201,7 +201,7 @@@
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.1-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar"/>
--      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.4.1-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.1-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.1-SNAPSHOT-sources.jar"/>

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

diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index 109dbb972209b59c9031a89f246b21be307320a6,f81c57b2c1529f436b4082807478c167206e2a44..8a8db7b123c02af2a53921708cb07ad606358933
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -1210,14 -1103,10 +1210,18 @@@
              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.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"
@@@ -1544,16 -1416,11 +1548,21 @@@
              id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
              name="Deep Delete">
        </command>
+       <command
+             defaultHandler="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
+             id="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
+             name="Fix Classification Hierarchy">
+       </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">