Merge branch 'develop' into LibrAlign

diff --cc .gitignore
index 05274d7b9b64f63005764ed53e4f513e52fcbd3f,ecfb4d5dfd34cf7944eced9a115dd0234f607665..a8aaf71fffb469ffa6dfbae45b229220b1621f12
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -31,4 -31,5 +31,6 @@@ eu.etaxonomy.taxeditor.webapp/lib/cdmli
  /eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.m2e.core.prefs
  /eu.etaxonomy.taxeditor.webapp/lib/
  
 +/.ssh
+ eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.xsd
+ eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/PUBLIC.xsd

diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index d09ef07c67d8c9b4071db4faa523524bcd6e2bf1,658cb9c72420f76de90f96432a3780cd76e9238c..8f6c238b5c847475d36edb9ef54a88aa71c0be34
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -1,251 -1,251 +1,251 @@@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<classpath>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-oauth2-2.0.11.RELEASE.jar"/>
 -      <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 -      <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 -      <classpathentry kind="src" path="src/main/java"/>
 -      <classpathentry kind="src" path="src/main/resources"/>
 -      <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.5.0-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.5.0-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.5.0-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.5.0-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.5.0-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.5.0-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.5.0-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.5.0-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.5.0-SNAPSHOT.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-csv-1.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-core-1.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/dtd-parser-1.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.7.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-5.0.1.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.7.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.7.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.7.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.7.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-5.5.2.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-5.5.2.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-5.2.2.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-cdi-5.2.2.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/httpclient-cache-4.2.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.6.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jandex-2.0.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.3.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.7.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/joda-time-2.9.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-facet-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-join-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-memory-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-misc-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-queries-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-component-annotations-1.5.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.15.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1206-jdbc4.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-aop-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-aspects-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-beans-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-context-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-context-support-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-core-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-expression-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-jdbc-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-orm-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-oxm-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-plugin-core-1.2.0.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-plugin-metadata-1.2.0.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-config-4.0.3.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-core-4.0.3.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-web-4.0.3.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-test-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-tx-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-web-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/spring-webmvc-4.2.4.RELEASE.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/springfox-core-2.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/springfox-schema-2.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/springfox-spi-2.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/springfox-spring-web-2.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/springfox-swagger-common-2.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/springfox-swagger2-2.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/standard-1.1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/stax-ex-1.7.7.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.5.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/swagger-models-1.5.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/tools.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/txw2-2.2.11.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.6.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xom-1.2.5.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xsom-20140925.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
 -      <classpathentry kind="output" path="target/classes"/>
 -</classpath>
 +<?xml version="1.0" encoding="UTF-8"?>\r
 +<classpath>\r
++      <classpathentry exported="true" kind="lib" path="lib/spring-security-oauth2-2.0.11.RELEASE.jar"/>\r
 +      <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>\r
 +      <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
 +      <classpathentry kind="src" path="src/main/java"/>\r
 +      <classpathentry kind="src" path="src/main/resources"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.4.0-SNAPSHOT.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.4.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.4.0-SNAPSHOT-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.4.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.4.0-SNAPSHOT-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.4.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.4.0-SNAPSHOT-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.4.0-SNAPSHOT.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.4.0-SNAPSHOT.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.4.0-SNAPSHOT.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.4.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.4.0-SNAPSHOT-sources.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.4.0-SNAPSHOT.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.5.0-SNAPSHOT.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.5.0-SNAPSHOT-sources.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.5.0-SNAPSHOT-sources.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.5.0-SNAPSHOT-sources.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.5.0-SNAPSHOT.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.5.0-SNAPSHOT.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.5.0-SNAPSHOT.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.5.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.5.0-SNAPSHOT-sources.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.5.0-SNAPSHOT.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.10.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-csv-1.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-core-1.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/dtd-parser-1.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/easymock-2.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/FastInfoset-1.2.13.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/guava-19.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/h2-1.4.190.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-5.0.7.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-5.0.1.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-5.0.7.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-5.0.7.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-5.0.7.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-5.0.7.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.1-api-1.0.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-4.2.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-analyzers-4.2.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-engine-5.5.2.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-5.5.2.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-5.2.2.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-cdi-5.2.2.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/httpclient-cache-4.2.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/istack-commons-runtime-2.21.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/istack-commons-tools-2.21.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.5.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.6.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-core-2.6.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.6.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jandex-2.0.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/javassist-3.20.0-GA.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/javax.el-2.2.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/javax.el-api-2.2.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.12.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-jxc-2.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-runtime-2.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb1-impl-2.2-EA.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jboss-logging-3.3.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jcl-over-slf4j-1.7.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jdbc4-2.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jdom2-2.0.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jena-arq-2.13.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jena-core-2.13.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jena-tdb-1.1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/joda-time-2.9.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jsonld-java-0.5.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jta-1.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/junit-4.12.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.7.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/libthrift-0.9.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lsid-client-1.1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lsid-server-1.1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-core-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-facet-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-join-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-memory-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-misc-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-queries-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/mapstruct-1.0.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.38.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.8.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/ognl-2.6.9.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/opencsv-2.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/paranamer-2.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-classworlds-1.2-alpha-9.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-component-annotations-1.5.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-container-default-1.0-alpha-30.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-utils-3.0.15.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/poi-3.13.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.13.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.13.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/postgresql-9.4-1206-jdbc4.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/relaxngDatatype-20020414.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/rngom-2.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/Saxon-HE-9.7.0-2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/snappy-java-1.0.4.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/solr-analysis-extras-3.6.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/solr-core-3.6.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/solr-solrj-3.6.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-aop-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-aspects-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-beans-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-context-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-context-support-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-core-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-expression-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-jdbc-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-orm-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-oxm-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-plugin-core-1.2.0.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-plugin-metadata-1.2.0.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-config-4.0.3.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-core-4.0.3.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-web-4.0.3.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-test-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-tx-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-web-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/spring-webmvc-4.2.4.RELEASE.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/springfox-core-2.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/springfox-schema-2.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/springfox-spi-2.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/springfox-spring-web-2.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/springfox-swagger-common-2.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/springfox-swagger2-2.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/standard-1.1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/stax-1.2.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/stax-ex-1.7.7.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.5.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/swagger-models-1.5.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/tools.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/txw2-2.2.11.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-core-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.4.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/usertype.jodatime-2.0.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/usertype.spi-2.0.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/validation-api-1.1.0.Final.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.3.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xalan-2.7.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.11.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xml-apis-1.0.b2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xml-resolver-1.2.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.6.0.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xmlgraphics-commons-1.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.6.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xom-1.2.5.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xpp3-1.1.4c.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xsom-20140925.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/xstream-1.4.8.jar"/>\r
 +      <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>\r
-       <classpathentry exported="true" kind="lib" path="lib/spring-security-oauth2-2.0.11.RELEASE.jar"/>\r
 +      <classpathentry kind="output" path="target/classes"/>\r
 +</classpath>\r

diff --cc eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index 29336904c97867b1adf1a0816401dfee47ffc712,22f8923e10f835452c5cd5a7fbb5974b0397897f..543d4e02e72c20c6f91b49d60abebad35a6ff2f7
--- 1/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@@ -2,25 -2,19 +2,25 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
- Bundle-Version: 4.4.0.qualifier
+ Bundle-Version: 4.5.0.qualifier
  Bundle-ClassPath: .,
 - lib/bioinfweb-commons-bio-2.0.0-preview-1.jar,
 - lib/bioinfweb-commons-core-2.0.0-preview-1.jar,
 - lib/bioinfweb-commons-swing-2.0.0-preview-1.jar,
 - lib/bioinfweb-commons-swt-2.0.0-preview-1.jar,
 - lib/core-1.9.2-SNAPSHOT.jar,
 - lib/libralign-biojava1-0.4.0-preview-1.jar,
 - lib/libralign-core-0.4.0-preview-1.jar,
 - lib/libralign-swt-0.4.0-preview-1.jar,
 - lib/sequencing-1.9.2-SNAPSHOT.jar,
 - lib/tic-core-2.0.0-preview-1.jar,
 - lib/tic-swt-2.0.0-preview-1.jar
 + lib/owlapi-xmlutils-4.1.4.jar,
 + lib/commons-collections4-4.1.jar,
 + lib/core-1.9.2.jar,
 + lib/sequencing-1.9.2.jar,
 + lib/commons-lang3-3.5.jar,
 + lib/commons-beanutils-1.9.2.jar,
 + lib/bioinfweb-commons-java-bio-2.0.0.jar,
 + lib/bioinfweb-commons-java-core-2.2.0.jar,
 + lib/bioinfweb-commons-java-swing-2.2.0.jar,
 + lib/bioinfweb-commons-java-swt-2.0.0.jar,
 + lib/jphyloio-core-0.3.0.jar,
 + lib/libralign-biojava1-0.4.0-preview-2.jar,
 + lib/libralign-core-0.4.0-preview-2.jar,
 + lib/libralign-io-0.4.0-preview-2.jar,
 + lib/libralign-swt-0.4.0-preview-2.jar,
 + lib/tic-core-2.0.0-preview-2.jar,
 + lib/tic-swt-2.0.0-preview-2.jar
  Export-Package: info.bioinfweb.commons,
   info.bioinfweb.commons.appversion,
   info.bioinfweb.commons.beans,

diff --cc eu.etaxonomy.taxeditor.molecular.lib/pom.xml
Simple merge

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

diff --cc eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java
index da122384a7af28eaa9445d2f2b70ee8a16515177,c1023e1c6c3266f7786bf7e2b0f6292f11d1c009..41a6b82e139ab0fe2c06b9315a91c183520c8bcc
--- 1/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java
--- 2/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java
@@@ -755,14 -761,4 +754,14 @@@ public class AlignmentEditor extends Ed
                }
                return id;
        }
- }
 +
 +
 +    public static URI getPherogramURI(SingleRead pherogramInfo) {
 +        if (pherogramInfo.getPherogram() != null) {
 +            return MediaUtils.getFirstMediaRepresentationPart(pherogramInfo.getPherogram()).getUri();
 +        }
 +        else {
 +            return null;
 +        }
 +    }
+ }

diff --cc eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AbstractPherogramComponentHandler.java
Simple merge

diff --cc eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 41c429529c90fe3c5f157820a21fc87e75453a32,e193176ecdb9e444097ede362d44bbc4341aa80f..fd6c1f29cdeb60e923c58b85946a0e3faad698f9
--- 1/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
--- 2/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@@ -1,58 -1,39 +1,39 @@@
 -<?xml version="1.0" encoding="UTF-8"?>
 -<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.5.0.qualifier">
 -  <aboutInfo>
 -    <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
 -    <text>
 -         %productBlurb
 -      </text>
 -  </aboutInfo>
 -  <configIni use="default"></configIni>
 -  <launcherArgs>
 -    <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080
 -      </programArgs>
 -    <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow
 -      </vmArgs>
 -    <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
 -      </vmArgsMac>
 -  </launcherArgs>
 -  <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
 -  <splash location="eu.etaxonomy.taxeditor.application" startupForegroundColor="000000" startupMessageRect="7,432,360,20" startupProgressRect="5,447,366,15"/>
 -  <launcher name="TaxonomicEditor">
 -    <solaris/>
 -    <win useIco="false">
 -      <bmp/>
 -    </win>
 -  </launcher>
 -  <vm></vm>
 -  <plugins></plugins>
 -  <features>
 -    <feature id="eu.etaxonomy.taxeditor.feature"/>
 -  </features>
 -  <configurations>
 -    <plugin autoStart="true" id="eu.etaxonomy.taxeditor.application" startLevel="5"/>
 -    <plugin autoStart="true" id="org.eclipse.core.runtime" startLevel="4"/>
 -    <plugin autoStart="true" id="org.eclipse.equinox.common" startLevel="2"/>
 -    <plugin autoStart="true" id="org.eclipse.equinox.ds" startLevel="2"/>
 -    <plugin autoStart="true" id="org.eclipse.equinox.p2.transport.ecf" startLevel="4"/>
 -    <plugin autoStart="true" id="org.eclipse.equinox.simpleconfigurator" startLevel="1"/>
 -  </configurations>
 -</product>
 +<?xml version="1.0" encoding="UTF-8"?>\r
- <?pde version="3.5"?>\r
- \r
- <product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">\r
- \r
-    <aboutInfo>\r
-       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
-       <text>\r
++<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="4.5.0.qualifier">\r
++  <aboutInfo>\r
++    <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
++    <text>\r
 +         %productBlurb\r
 +      </text>\r
-    </aboutInfo>\r
- \r
-    <configIni use="default">\r
-    </configIni>\r
- \r
-    <launcherArgs>\r
-       <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080\r
++  </aboutInfo>\r
++  <configIni use="default"></configIni>\r
++  <launcherArgs>\r
++    <programArgs>-data @user.home/.cdmLibrary -Dserver_port=58080\r
 +      </programArgs>\r
-       <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow\r
++    <vmArgs>-Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow\r
 +      </vmArgs>\r
-       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
++    <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
 +      </vmArgsMac>\r
-    </launcherArgs>\r
- \r
-    <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
- \r
-    <splash\r
-       location="eu.etaxonomy.taxeditor.application"\r
-       startupProgressRect="5,447,366,15"\r
-       startupMessageRect="7,432,360,20"\r
-       startupForegroundColor="000000" />\r
-    <launcher name="TaxonomicEditor">\r
-       <solaris/>\r
-       <win useIco="false">\r
-          <bmp/>\r
-       </win>\r
-    </launcher>\r
- \r
-    <vm>\r
-    </vm>\r
- \r
-    <plugins>\r
-    </plugins>\r
- \r
-    <features>\r
-       <feature id="eu.etaxonomy.taxeditor.feature"/>\r
-    </features>\r
- \r
-    <configurations>\r
-       <plugin id="eu.etaxonomy.taxeditor.application" autoStart="true" startLevel="5" />\r
-       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />\r
-       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />\r
-       <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />\r
-       <plugin id="org.eclipse.equinox.p2.transport.ecf" autoStart="true" startLevel="4" />\r
-       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />\r
-    </configurations>\r
- \r
++  </launcherArgs>\r
++  <windowImages i16="/eu.etaxonomy.taxeditor.application/icons/256color_16x16.gif" i32="/eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif" i48="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>\r
++  <splash location="eu.etaxonomy.taxeditor.application" startupForegroundColor="000000" startupMessageRect="7,432,360,20" startupProgressRect="5,447,366,15"/>\r
++  <launcher name="TaxonomicEditor">\r
++    <solaris/>\r
++    <win useIco="false">\r
++      <bmp/>\r
++    </win>\r
++  </launcher>\r
++  <vm></vm>\r
++  <plugins></plugins>\r
++  <features>\r
++    <feature id="eu.etaxonomy.taxeditor.feature"/>\r
++  </features>\r
++  <configurations>\r
++    <plugin autoStart="true" id="eu.etaxonomy.taxeditor.application" startLevel="5"/>\r
++    <plugin autoStart="true" id="org.eclipse.core.runtime" startLevel="4"/>\r
++    <plugin autoStart="true" id="org.eclipse.equinox.common" startLevel="2"/>\r
++    <plugin autoStart="true" id="org.eclipse.equinox.ds" startLevel="2"/>\r
++    <plugin autoStart="true" id="org.eclipse.equinox.p2.transport.ecf" startLevel="4"/>\r
++    <plugin autoStart="true" id="org.eclipse.equinox.simpleconfigurator" startLevel="1"/>\r
++  </configurations>\r
 +</product>\r