completing merge from trunk for latest taxed developments

diff --cc .gitattributes
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 05574f256d9b3b978863a0b3d6d911fff101236d,05574f256d9b3b978863a0b3d6d911fff101236d..5793674d4469d67a9ab8ce710fff4edd54fd92b6
--- 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
@@@ -729,8 -729,8 +729,8 @@@ public class DetailsViewer extends Abst
                          getConversationHolder(), parent, this, Section.TWISTIE
                                  | Section.EXPANDED);
  
--        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
--
++//        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
++//
  //        GeographicalScopeDetailSection geographicalScopeDetailSection = (GeographicalScopeDetailSection) formFactory
  //                .createEntityDetailSection(EntityDetailType.GEOGRAPHICAL_SCOPE,
  //                        getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);
@@@ -742,16 -742,16 +742,16 @@@
  //                        getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);
  //
  //        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
--
--        TaxonomicScopeSection taxonomicScopeSection = (TaxonomicScopeSection) formFactory
--                .createEntityDetailSection(EntityDetailType.TAXONOMIC_SCOPE,
--                        getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);        
++//
++//        TaxonomicScopeSection taxonomicScopeSection = (TaxonomicScopeSection) formFactory
++//                .createEntityDetailSection(EntityDetailType.TAXONOMIC_SCOPE,
++//                        getConversationHolder(), parent, Section.TWISTIE | Section.COMPACT);        
  
            addPart(polytomousKeyDetailSection);
            addPart(polytomousKeyNodeDetailSection);
  //        addPart(geographicalScopeDetailSection);
  //        addPart(scopeRestrictionSection);
--          addPart(taxonomicScopeSection);
++//        addPart(taxonomicScopeSection);
  
        }