merge trunk into cdm-3.3

diff --cc cdmlib-remote-webapp/pom.xml
index 906adb179b455f4047342495e5c191b29759a914,b9d27da875298271066e2a7bc5280777fb75998e..36316023ea0e01f2f353debf7bb1358271034867
--- 1/cdmlib-remote-webapp/pom.xml
--- 2/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@@ -4,10 -4,10 +4,10 @@@
    <parent>
      <artifactId>cdmlib-parent</artifactId>
      <groupId>eu.etaxonomy</groupId>
 -    <version>3.2.0-SNAPSHOT</version>
 +    <version>3.3.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
-   
+ 
    <groupId>eu.etaxonomy</groupId>
    <artifactId>cdmlib-remote-webapp</artifactId>
    <name>CDM Remote Webapp</name>

diff --cc cdmlib-remote/pom.xml
Simple merge

diff --cc pom.xml
Simple merge