merge-update from trunk

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
index c87d90c01b928646f41a3d0d3924e5f6c5dabafd,3c191efe9b277a9099cd99da934e5bf4635d1dd9..0780d07145dcde8c6dab314e3dda72b708656af4
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyDetailElement.java
@@@ -6,9 -6,10 +6,10 @@@ package eu.etaxonomy.taxeditor.ui.secti
  import org.eclipse.swt.SWT;
  
  import eu.etaxonomy.cdm.model.description.PolytomousKey;
 +import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
  import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
  import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
 -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+ import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
  import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
  
  /**

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
index 7878c67965ec20380da982e21f458e642923a5cc,a049590217cf55cf36becb10de454b4e4ef8bd9b..d7df9fa7cda280e6bacaa61dc90ea3f076d16012
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/DefinedTermDetailElement.java
@@@ -11,8 -11,9 +11,9 @@@ package eu.etaxonomy.taxeditor.ui.secti
  \r
  import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
  import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 +import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;\r
  import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;\r
 -import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;\r
+ import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;\r
  \r
  /**\r
   * @author l.morris\r