Merge branch 'develop' into unify_derivative_views

Conflicts:
	eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 5908ab91e92db921f6b6fcf5991d089c43ae1182,6a0dab25f8ac9b57a3da8a371495f890d70fed8a..8618277b452902f3adb4b24a438903e79817a655
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@@ -584,20 -593,7 +594,11 @@@ public class DetailsViewer extends Abst
              DeterminationDetailSection determinationDetailSection = formFactory.createDeterminationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
              addPart(determinationDetailSection);
          }
-         if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_TAXON_ASSOCIATIONS)){
-             formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-             TaxonAssociationDetailSection taxonAssociationDetailSection = formFactory.createTaxonAssociationDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-             addPart(taxonAssociationDetailSection);
-         }
  
-         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-         IdentifierDetailSection identifierDetailSection = formFactory.createIdentifierDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE);
-         addPart(identifierDetailSection);
- 
 +        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 +        DerivedUnitTypeDesignationSection derivedUnitTypeDesignationSection = formFactory.createDerivedUnitTypeDesignationSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
 +        addPart(derivedUnitTypeDesignationSection);
 +
      }
  
      private void createFieldUnitSection(RootElement parent) {