merge-update from trunk

diff --cc .gitattributes
Simple merge

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index fc1be090d1e87a86f08ac33b6157af6a5bd60430,055880fa63e2e720de579eb22c7036932ba028c6..6ea97d966a9dda6a98b0a0e2239d29afd379fefd
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@@ -114,10 -125,8 +124,10 @@@ public class DerivateLabelProvider exte
       * @param element
       * @return
       */
-     public static String getDerivateText(Object element){
+     public String getDerivateText(Object element){
 +        TreeNode parentNode = null;
          if(element instanceof TreeNode){
 +            parentNode = ((TreeNode) element).getParent();
              //unwrap specimen from TreeNode
              element = ((TreeNode) element).getValue();
          }

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
index a3d77a8eee3075896714b7fe691b4d15dfe9fa53,536c3b2b78694396052c43ecc3fca9217bf3d5df..6bfd38b54932c6149c5321570457331eb02bf29c
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
@@@ -51,15 -52,13 +52,16 @@@ public class DerivateSearchCompositeCon
      private final DerivateSearchComposite derivateSearchComposite;
      private IIdentifiableEntityServiceConfigurator<SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy>> configurator;
      private EnumTermComboController<SpecimenOrObservationType> enumTermComboController;
 -
+     private DerivateLabelProvider labelProvider;
- 
 +    private final DerivateSearchView derivateSearchView;
++      private DerivateLabelProvider labelProvider;    
      /**
       * @param parent
 +     * @param derivateSearchView
       */
 -    public DerivateSearchCompositeController(Composite parent) {
 +    public DerivateSearchCompositeController(Composite parent, DerivateSearchView derivateSearchView) {
          this.derivateSearchComposite = new DerivateSearchComposite(parent, SWT.NONE);
 +        this.derivateSearchView = derivateSearchView;
          init();
      }
  

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
Simple merge