merge hotfix4.11.1 into develop

diff --combined eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
index ed791e761112b192f62a8c298e1a24cb4360fb07,3340ed5748cfbd57b1232286a5c5cf2cfd93fb5b..759cd404627997ac856f23a448aa4486fbb4726c
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
@@@ -129,10 -129,8 +129,10 @@@ public abstract class AbstractCdmEditor
              return;
          }
          if (viewer != null && viewer.getControl()!= null && viewer.getInput() != null){
- 
 -              viewer.getControl().setEnabled(true);
 +            viewer.getControl().setEnabled(true);
          }
 +
++
          if(previousSelection==null ||
                  previousSelection!=selection){//skip redundant rendering of details view
              if(delaySelection==null){

diff --combined eu.etaxonomy.taxeditor/pom.xml
index b52f0048e3481bb59608041ad3aead30c9ff057b,bdccde3d41ad685cad1684537ff3e54af1311bd1..9255c25c1cf0afe286f9b875b14071575d8f95ce
--- 1/eu.etaxonomy.taxeditor/pom.xml
--- 2/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@@ -2,7 -2,7 +2,11 @@@
    <parent>
      <groupId>eu.etaxonomy</groupId>
      <artifactId>taxeditor-parent</artifactId>
++<<<<<<< HEAD
 +    <version>4.12.0-SNAPSHOT</version>
++=======
+     <version>4.11.1</version>
++>>>>>>> hotfix/4.11.1
    </parent>
  
    <modelVersion>4.0.0</modelVersion>