merge-update from trunk

diff --cc .gitattributes
index 817258fa912600c6ab8eca801b9e28352361b032,cc961909e087de205ee9102fa406fba862bd8d5a..b75d7ac6ee138e7f99701d499baaa4c1dadfcd78
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -357,12 -362,7 +362,11 @@@ 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/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/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.properties -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
@@@ -386,7 -386,7 +390,8 @@@ 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/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/SaveAllHandler.java -text

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

diff --cc eu.etaxonomy.taxeditor.editor/build.properties
index 506d9dbd52bf5203ba7bd483baaf048d8fc74e78,356db7a1cda467ef29a56af7be60e2cd7b2bc5c8..91c9366ccd8cceb0e4822c88c9175f36bc7e8df9
--- 1/eu.etaxonomy.taxeditor.editor/build.properties
--- 2/eu.etaxonomy.taxeditor.editor/build.properties
+++ b/eu.etaxonomy.taxeditor.editor/build.properties
@@@ -3,12 -3,8 +3,14 @@@ source.. = src/main/java/,
  bin.includes = META-INF/,\
                 .,\
                 plugin.xml,\
-                plugin.properties,\
+                OSGI-INF/l10n/plugin.properties,\
                 icons/,\
                 p2.inf,\
 -               OSGI-INF/l10n/plugin_en.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/

diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index 881d760a0c780791a56055d9f13edb8344aa3f83,1290226d262b9e0654598cdb67623d53858f67eb..1cd71ee2541b3c521d0f4a81631f5e9211b1ccc7
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -76,13 -76,13 +76,19 @@@
              default="false"
              id="eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor"
              name="Gbif Import Editor">
+       </editor>
+          <editor
+             class="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
+             icon="icons/address-book-new.png"
+             id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
+             name="Checklist Editor">
        </editor>
 +      <editor
 +            class="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
 +            default="false"
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor"
 +            name="Alignment Editor">
 +      </editor>
     </extension>
        <extension
              point="org.eclipse.ui.views">
@@@ -1136,8 -1135,13 +1146,13 @@@
        <command
              defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
              id="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
-             name="Open Derivate View">
+             name="%command.name.35">
+       </command>
+        <command
+              defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
+              id="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistViewHandler"
+              name="Open Checklist Editor">
 -       </command>
 +      </command>
        <command
              categoryId="eu.etaxonomy.taxeditor.editor.new.category"
              defaultHandler="eu.etaxonomy.taxeditor.view.datasource.handler.CreateDataSourceHandler"

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 5a207f501b8522c2c240d769194dda7868094b00,d3f414a0334e9c9f93ee75f1216c7e1ea9d12b9a..4ed9313d32cf8063e44cccad67ca856f13df9eb9
--- 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
@@@ -35,8 -35,8 +35,10 @@@ import eu.etaxonomy.taxeditor.editor.gr
  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.molecular.AlignmentEditor;
 +import eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditorInput;
+ import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditorInput;
+ import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor;
  import eu.etaxonomy.taxeditor.editor.view.dataimport.BioCaseEditorInput;
  import eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditor;
  import eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorInput;
@@@ -105,16 -105,17 +107,27 @@@ public class EditorUtil extends Abstrac
            open(input, DerivateView.ID);
        }
  
+ 
+       /**
+        * Opens a new ChecklistView for the given input
+        * @param input a {@link ChecklistEditorInput} representing the selected checklist
+        * @throws PartInitException
+        */
+       public static void open(ChecklistEditorInput input)
+               throws PartInitException {
+           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}