merge-update from trunk

diff --cc .gitattributes
Simple merge

diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
Simple merge

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
Simple merge

diff --cc pom.xml
index 86e67931cbccc11ccfdf70844a392d3183bf51f4,9594ac829c75fb73d0a4a38dba0a70ff79a52ddb..7a73c8888453abb83b74a2baf3b63f6360a46e9f
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -15,10 -15,10 +15,10 @@@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    <cdmlib.version>3.3.8-SNAPSHOT</cdmlib.version>
 +    <cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.14.0</tycho.version>
-     <taxeditor.version>3.3.7-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.3.8-SNAPSHOT</taxeditor.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>