Merge branch 'develop' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/.classpath
	eu.etaxonomy.taxeditor.editor/plugin.xml
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
	eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/handler/DeleteHandler.java
	eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
	eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java
	eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
	eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
	eu.etaxonomy.taxeditor.store/plugin.xml

diff --combined eu.etaxonomy.taxeditor.application/.classpath
index 4c0364cadc7a33d0798a7c7813ef92548fe8cb81,4c7e96f59500b4f98198fb4a11bdf511d1107b48..0f0d04b90bfb69678c587c34bb3585294306ea2f
--- 1/eu.etaxonomy.taxeditor.application/.classpath
--- 2/eu.etaxonomy.taxeditor.application/.classpath
+++ b/eu.etaxonomy.taxeditor.application/.classpath
@@@ -3,6 -3,6 +3,7 @@@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 -      <classpathentry kind="src" path="src/main/resources"/>
 +      <classpathentry kind="src" path="src/test/java"/>
++      <classpathentry kind="src" path="src/main/resources/"/>
        <classpathentry kind="output" path="target/classes"/>
  </classpath>

diff --combined eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
index c26e4b2eb20c2dd842d9e18316f697af29a1328f,4c97dbfb51582f3a52d614059d26acf2f4b05d12..5b7b601e78eae0be27acafd4fa4c1947d50811a9
--- 1/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
--- 2/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
@@@ -42,6 -42,7 +42,7 @@@ import eu.etaxonomy.taxeditor.annotated
  import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
  import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
  import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
+ import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonEditorInput;
  import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadePart;
  import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
  import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
@@@ -170,7 -171,6 +171,7 @@@ public class BulkEditor extends Annotat
                        displayWarningDialog();
                        isInitialFocus = false;
                }
 +              super.setFocus();
        }
  
        private void displayWarningDialog() {
@@@ -310,4 -310,9 +311,9 @@@
                menu.remove(ITextEditorActionConstants.SHIFT_LEFT);
                menu.remove(ITextEditorActionConstants.CONTEXT_PREFERENCES);
        }
+ 
+       @Override
+       public boolean canAttachMedia() {
+           return getEditorInput() instanceof TaxonEditorInput?true:false;
+       }
  }

diff --combined eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
index 92431c5a39269a1360910a4f074996e113b81f1b,4c2dccc55e38157da4cff496d941179ebc5c4152..c4c7854749c2c204e9b9d83d8cfec3b16ae8a917
--- 1/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
--- 2/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
@@@ -48,13 -48,11 +48,13 @@@ public class AgentEditorInput extends A
                return ID;
        }
  
 +
        @Override
      public String getName() {
                return BulkEditorInputType.AGENT.label;
        }
  
 +
        @Override
      public String getToolTipText() {
                return getName();
@@@ -73,7 -71,6 +73,7 @@@
                return true;
        }
  
 +
        /** {@inheritDoc} */
        @Override
        public boolean isConvertingEnabled() {
@@@ -85,7 -82,7 +85,7 @@@
      public boolean merge(TeamOrPersonBase entity, TeamOrPersonBase mergeTarget) {
                if (entity instanceof IMergable) {
                        try {
-                               if(entity instanceof Person) {
+                               if(entity instanceof Person && mergeTarget instanceof Person) {
                                    IMergeStrategy strategy = DefaultMergeStrategy.NewInstance(Person.class);
                                    strategy.setMergeMode("institutionalMemberships", MergeMode.FIRST);
                                    CdmStore.getCommonService().merge(mergeTarget.getId(), entity.getId(), Person.class);
@@@ -120,6 -117,7 +120,6 @@@
  
  
        public boolean delete(AgentBase entity) throws ReferencedObjectUndeletableException  {
 -
                        return CdmStore.getService(IAgentService.class).delete(entity) != null;
  
        }
@@@ -139,20 -137,14 +139,20 @@@
                return sortProviders;
        }
  
 +
        @Override
        protected IEntityCreator<TeamOrPersonBase> createEntityCreator() {
                return new AgentCreator();
        }
  
        @Override
 -      public boolean save(TeamOrPersonBase entity) {
 -              return CdmStore.getService(IAgentService.class).saveOrUpdate(entity) != null;
 +      public TeamOrPersonBase save(TeamOrPersonBase entity) {
 +          if(CdmStore.getCurrentSessionManager().isRemoting()) {
 +              return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity);
 +          } else {
 +              CdmStore.getService(IAgentService.class).saveOrUpdate(entity) ;
 +              return entity;
 +          }
        }
  
        @Override
@@@ -162,13 -154,4 +162,13 @@@
                return false;
        }
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
 +     */
 +    @Override
 +    public void merge() {
 +
 +    }
 +
 +
  }

diff --combined eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index 105ece954473bed55240ee88b1c9c7f71e12a7b0,604f3874a6d788c0f879e2e7f6f6cf5d77648c06..91acc404f197013e8602b6d8a4745de53f65aa68
--- 1/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
--- 2/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@@ -67,7 -67,7 +67,7 @@@ import eu.etaxonomy.taxeditor.view.Abst
   * @created 08.07.2009
   * @version 1.0
   */
 -public class ReferencingObjectsView extends AbstractCdmViewPart{
 +public class ReferencingObjectsView extends AbstractCdmViewPart {
        private static final Logger logger = Logger
                        .getLogger(ReferencingObjectsView.class);
  
@@@ -264,7 -264,7 +264,7 @@@
                                }
                                showViewer();
                        }catch(Exception e){
-                               setContentDescription("Some Problems occured.");
+                               setContentDescription("The referencing objects view could not be loaded completely. Some Problems occured.");
                        }
  
                }
@@@ -352,4 -352,5 +352,4 @@@
  
        }
  
 -
  }

diff --combined eu.etaxonomy.taxeditor.cdmlib/.classpath
index f0537b16b8994140e46a2d6b938134e69f90fb3a,5f958ce4af119eaecd27cb317134ea5e5d20692f..cca90515a25420cc0eae4779c6b557d35b5e96e4
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -1,202 -1,209 +1,201 @@@
 -<?xml version="1.0" encoding="UTF-8"?>\r
 -<classpath>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.8.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.8.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.8.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.8.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.8.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.8.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.8.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.8.0-SNAPSHOT-sources.jar"/>\r
 -      <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\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/aspectjrt-1.7.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.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.7.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.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.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.8.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.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-logging-1.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.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/easymock-3.1.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.9.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.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-4.0.1.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.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-4.2.0.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.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-SNAPSHOT-sources.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.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-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/javassist-3.17.1-GA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.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/jboss-logging-3.1.3.GA.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/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/joda-time-2.1.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.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-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.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.eclipse.equinox.common-3.6.0.v20110523.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.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-container-default-1.0-alpha-30.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.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.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.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-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.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-security-config-3.1.3.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.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/unitils-core-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-database-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-dbmaintainer-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-dbunit-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-easymock-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-inject-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-mock-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-orm-3.3.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/unitils-spring-3.3.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.0.0.GA.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xalan-2.6.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/xmlgraphics-commons-1.5.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.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.4.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xom-1.0.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/xstream-1.4.4.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/google-api-translate-java-0.92.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>\r
 -      <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>\r
 -      <classpathentry kind="output" path="target/classes"/>\r
 -</classpath>\r
 +<?xml version="1.0" encoding="UTF-8"?>
 +<classpath>
 +      <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 +      <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 +      <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="resources"/>
 +      <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/aspectjrt-1.7.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.7.1.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.7.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.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.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.8.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-codec-20041127.091804.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.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-logging-1.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.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-logging-api-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-module-apt-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-module-xhtml-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/doxia-sink-api-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.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-4.0.1.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-jpa-2.0-api-1.0.1.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-4.2.0.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-search-orm-4.2.0.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hibernate-validator-4.3.1.Final.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.10.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/httpclient-4.2.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/httpcore-4.2.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/icu4j-2.6.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/identificationKeyAPI-1.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/itextpdf-5.4.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.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/javassist-3.17.1-GA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.2.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2-EA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jaxb-xjc-2.2-EA.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/jboss-logging-3.1.3.GA.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/jdbc4-2.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/joda-time-2.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/json-lib-2.4-jdk15.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jsr250-api-1.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jtds-1.3.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/junit-4.11.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/junit-benchmarks-0.5.0.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-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-core-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-facet-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-grouping-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-highlighter-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-kuromoji-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-memory-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-misc-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-phonetic-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-queries-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-spatial-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-spellchecker-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/lucene-stempel-3.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/mchange-commons-java-0.2.3.3.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.24.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/objenesis-1.2.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.eclipse.equinox.common-3.6.0.v20110523.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.osgi.core-1.0.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aop-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.aspects-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.beans-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.context-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.core-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.expression-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.jdbc-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.orm-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.oxm-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.test-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.transaction-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/org.springframework.web.servlet-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/osgi-3.6.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/p6spy-1.3.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-container-default-1.0-alpha-30.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/plexus-utils-2.0.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/postgresql-9.1-901.jdbc4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/sanselan-0.97-incubator.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/servlet-api-2.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.2.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-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-beans-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-context-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-context-support-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-core-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-expression-3.2.2.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-modules-cache-0.7.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-config-3.1.3.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-core-3.1.3.RELEASE.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/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.0.0.GA.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/wsdl4j-1.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xalan-2.6.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/xmlgraphics-commons-1.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlunit-1.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xom-1.0.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/xstream-1.4.4.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist-9.0.8.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/google-api-translate-java-0.92.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/odfdom-0.8.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/h2mig_pagestore_addon.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.8.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.8.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.8.0-SNAPSHOT.jar" sourcepath="/data/.m2/repository/eu/etaxonomy/cdmlib-io/3.8.0-SNAPSHOT/cdmlib-io-3.8.0-SNAPSHOT-sources.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.8.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.8.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.8.0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.8.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.8.0-SNAPSHOT.jar"/>
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.8.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.8.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
 +      <classpathentry kind="output" path="target/classes"/>
 +</classpath>

diff --combined eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 6a720bcca7dc13c6d5a1239f7abf96411d973053,d4471b24e77cb6f4e5a656b8fcce88e8d1df0757..a68089a661b9ebdff9e45e93c2c953148f25acd1
--- 1/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@@ -9,9 -9,9 +9,10 @@@ Bundle-Localization: OSGI-INF/l10n/plug
  Export-Package: eu.etaxonomy.taxeditor.editor,
   eu.etaxonomy.taxeditor.editor.handler,
   eu.etaxonomy.taxeditor.editor.internal,
+  eu.etaxonomy.taxeditor.editor.key.polytomous,
   eu.etaxonomy.taxeditor.editor.name,
   eu.etaxonomy.taxeditor.editor.name.handler,
 + eu.etaxonomy.taxeditor.editor.name.operation,
   eu.etaxonomy.taxeditor.editor.view.concept,
   eu.etaxonomy.taxeditor.editor.view.dataimport,
   eu.etaxonomy.taxeditor.editor.view.descriptive,

diff --combined eu.etaxonomy.taxeditor.editor/plugin.xml
index 3dc4659d3d6c02c00691190e365b065fb505d82b,66def47309837982fcbfaea4fa1efb79fc917fc0..d3812b9e34bf57ac742abd35716ba0dda4edfe10
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -685,7 -685,10 +685,10 @@@
                    <reference
                          definitionId="isFeatureNodeContainer">
                    </reference>
-                </or>
+                    <reference
+                         definitionId="isDescriptionElement">
+                   </reference>
+               </or>
              </visibleWhen>
           </command>
           <separator
@@@ -1106,24 -1109,6 +1109,24 @@@
              class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
              commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
        </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.RemotingCreateChildPolytomousKeyNodeHandler"
 +            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.child">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.editor.key.polytomous.handler.RemotingCreateSiblingPolytomousKeyNodeHandler"
 +            commandId="eu.etaxonomy.taxeditor.key.polytomous.command.new.sibling">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
     </extension>
     <extension
           name="%extension.name"
@@@ -1634,12 -1619,24 +1637,30 @@@
              </test>
           </with>
        </definition>
 +      <definition
 +            id="isRemoting">
 +         <test
 +               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isRemoting">
 +         </test>
 +      </definition>
+       <definition
+             id="isSequence">
+          <with
+                variable="selection">
+             <test
+                   property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSequence">
+             </test>
+          </with>
+       </definition>
+       <definition
+             id="isSingleRead">
+          <with
+                variable="selection">
+             <test
+                   property="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester.isSingleRead">
+             </test>
+          </with>
+       </definition>
     </extension>
     <extension
           point="org.eclipse.core.expressions.propertyTesters">
@@@ -1664,6 -1661,13 +1685,13 @@@
              properties="isGroupEditor"
              type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">
        </propertyTester>
+       <propertyTester
+             class="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
+             id="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
+             namespace="eu.etaxonomy.taxeditor.editor.handler.SpecimenPropertyTester"
+             properties="isSequence,isSingleRead"
+             type="org.eclipse.jface.viewers.IStructuredSelection">
+       </propertyTester>
     </extension>
     <extension
           point="org.eclipse.ui.bindings">   
@@@ -1685,7 -1689,7 +1713,7 @@@
           </description>
        </wizard>
     </extension>
--    <extension
++   <extension
            point="eu.etaxonomy.taxeditor.store.cdmViewer">
         <cdmViewer
               class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">

diff --combined eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 0fe15d675f656edbbf182337a5462c4f864ca4cc,e87142c40ea62fbe582d74221d87aa1d5b932a1a..d373467b397643aa5c9a8c6e918fb5061c6b51ed
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@@ -24,17 -24,14 +24,17 @@@ import org.eclipse.swt.widgets.Shell
  import org.eclipse.ui.IEditorInput;
  import org.eclipse.ui.IEditorPart;
  import org.eclipse.ui.IEditorReference;
 +import org.eclipse.ui.IWorkbenchPage;
  import org.eclipse.ui.PartInitException;
  import org.eclipse.ui.handlers.HandlerUtil;
  
  import eu.etaxonomy.cdm.api.service.ITaxonService;
 +import eu.etaxonomy.cdm.model.common.ITreeNode;
  import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
  import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
  import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
  import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 +import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor;
  import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput;
  import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
@@@ -171,7 -168,9 +171,9 @@@ public class EditorUtil extends Abstrac
          }
                TaxonEditorInput input = TaxonEditorInput
                                .NewInstanceFromTaxonBase(taxonBaseUuid);
-               open(input);
+               if(input!=null){
+                   open(input);
+               }
        }
  
        /**
@@@ -387,12 -386,6 +389,12 @@@
                open(input);
        }
  
 +//    public static void openPolytomousKeyEditor(UUID polytomousKeyUuid, String name)
 +//            throws Exception {
 +//        PolytomousKeyEditorInput input = new PolytomousKeyEditorInput(polytomousKeyUuid, name);
 +//        open(input);
 +//    }
 +
        public static void openCdmAuthorities(UUID groupUuid)
                        throws Exception {
                CdmAuthorityEditorInput input = CdmAuthorityEditorInput.NewInstance(groupUuid);
@@@ -462,28 -455,4 +464,28 @@@
              openTaxonBase(((TaxonBase<?>) object).getUuid());
          }
      }
 +
 +    public static boolean closeObsoleteEditor(TaxonNode taxonNode, IWorkbenchPage activePage){
 +        boolean result = true;
 +        for (IEditorReference ref : activePage.getEditorReferences()) {
 +            try {
 +                String treeIndex = ((ITreeNode)taxonNode).treeIndex();
 +
 +
 +                IEditorInput input = ref.getEditorInput();
 +                if (input instanceof TaxonEditorInput) {
 +                    TaxonNode node = ((TaxonEditorInput) input).getTaxonNode();
 +                    //if node is a child of taxonNode then close the editor
 +                    if( ((ITreeNode) node).treeIndex().startsWith(treeIndex)){
 +                    //if (taxonNode.equals(node)) {
 +                        result &= activePage.closeEditor(ref.getEditor(false), true);
 +
 +                    }
 +                }
 +            } catch (PartInitException e) {
 +                continue;
 +            }
 +        }
 +        return result;
 +    }
  }

diff --combined eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index 64041cfa82e315d55a96812ee6fa7babc6e7e779,c805c6f165e7a4d70d2fd3c172b7b67a8a8e2606..efa20054873e05268870de677b0b7ae37413aa85
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@@ -2,8 -2,6 +2,8 @@@ package eu.etaxonomy.taxeditor.editor.v
  
  import java.util.Collection;
  import java.util.HashSet;
 +import java.util.List;
 +import java.util.Map;
  import java.util.Map.Entry;
  import java.util.Set;
  import java.util.UUID;
@@@ -47,8 -45,6 +47,8 @@@ import eu.etaxonomy.taxeditor.model.IPa
  import eu.etaxonomy.taxeditor.model.IPartContentHasMedia;
  import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
  import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 +import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 +import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
  import eu.etaxonomy.taxeditor.store.CdmStore;
  import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateContentProvider;
  import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
@@@ -59,7 -55,7 +59,7 @@@
   */
  public class DerivateView extends EditorPart implements IPartContentHasFactualData, IDirtyMarkable,
          IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IPartContentHasMedia,
 -        ISelectionChangedListener, IPostOperationEnabled {
 +        ISelectionChangedListener, IPostOperationEnabled , ICdmEntitySessionEnabled {
  
      public static final String ID = "eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView";
  
@@@ -77,25 -73,16 +77,22 @@@
  
      private ISelection selection = null;
  
 +    private final ICdmEntitySession cdmEntitySession;
 +
 +    private DerivateContentProvider contentProvider;
 +
      /**
       * Default constructor
       */
      public DerivateView() {
 +        cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-      */
      @Override
      public void createPartControl(Composite parent) {
          viewer = new TreeViewer(new Tree(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION));
 -        viewer.setContentProvider(new DerivateContentProvider());
 +        contentProvider = new DerivateContentProvider();
 +        viewer.setContentProvider(contentProvider);
          labelProvider = new DerivateLabelProvider();
          labelProvider.setConversation(conversation);
          viewer.setLabelProvider(labelProvider);
@@@ -133,9 -120,6 +130,6 @@@
          viewer.addDropSupport(dndOperations, transfers, new DerivateDropListener(this));
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-      */
      @Override
      public void doSave(IProgressMonitor monitor) {
          String taskName = "Saving hierarchy";
@@@ -151,7 -135,6 +145,7 @@@
  
          // commit the conversation and start a new transaction immediately
          conversation.commit(true);
 +        CdmStore.getService(IOccurrenceService.class).merge(getRootEntities());
          monitor.worked(1);
  
          this.setDirty(false);
@@@ -161,16 -144,10 +155,10 @@@
          refreshTree();
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.EditorPart#doSaveAs()
-      */
      @Override
      public void doSaveAs() {
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.EditorPart#getTitleToolTip()
-      */
      @Override
      public String getTitleToolTip() {
          if(getEditorInput() instanceof DerivateViewEditorInput){
@@@ -180,9 -157,6 +168,6 @@@
          return "Derivative Editor";
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-      */
      @Override
      public void init(IEditorSite site, IEditorInput input) throws PartInitException {
          setSite(site);
@@@ -194,9 -168,6 +179,6 @@@
          }
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.EditorPart#isDirty()
-      */
      @Override
      public boolean isDirty() {
          return isDirty;
@@@ -209,18 -180,11 +191,11 @@@
          this.isDirty = isDirty;
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
-      */
      @Override
      public boolean isSaveAsAllowed() {
          return false;
      }
  
- 
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-      */
      @Override
      public void setFocus() {
          viewer.getControl().setFocus();
@@@ -228,19 -192,12 +203,13 @@@
          if(!conversation.isBound()){
              conversation.bind();
          }
 +        cdmEntitySession.bind();
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap)
-      */
      @Override
      public void update(CdmDataChangeMap changeEvents) {
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
-      */
      @Override
      public ConversationHolder getConversationHolder() {
          return conversation;
@@@ -253,9 -210,6 +222,6 @@@
          return viewer;
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider#changed(java.lang.Object)
-      */
      @Override
      public void changed(Object element) {
          setDirty(true);
@@@ -263,9 -217,6 +229,6 @@@
          viewer.refresh();
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider#forceDirty()
-      */
      @Override
      public void forceDirty() {
          changed(null);
@@@ -293,7 -244,6 +256,6 @@@
          viewer.refresh();
      }
  
- 
      private void generateMultiLinkSingleReads() {
          Set<SingleRead> multiLinkSingleReads = new HashSet<SingleRead>();
          for(Entry<SingleRead, Collection<Sequence>> entry:CdmStore.getService(ISequenceService.class).getSingleReadSequencesMap().entrySet()){
@@@ -311,9 -261,6 +273,6 @@@
          return this.multiLinkSingleReads;
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-      */
      @Override
      public void selectionChanged(SelectionChangedEvent event) {
          this.selection  = event.getSelection();
@@@ -327,9 -274,6 +286,6 @@@
          return labelProvider;
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.taxeditor.operation.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
-      */
      @Override
      public boolean postOperation(CdmBase objectAffectedByOperation) {
          refreshTree();
@@@ -339,43 -283,14 +295,44 @@@
          return true;
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.taxeditor.operation.IPostOperationEnabled#onComplete()
-      */
      @Override
      public boolean onComplete() {
          return true;
      }
  
 -
 +    @Override
 +    public void dispose() {
 +        cdmEntitySession.dispose();
 +        super.dispose();
 +    }
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getCdmEntitySession()
 +     */
 +    @Override
 +    public ICdmEntitySession getCdmEntitySession() {
 +       return cdmEntitySession;
 +    }
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
 +     */
 +    @Override
 +    public List<SpecimenOrObservationBase>  getRootEntities() {
 +        return contentProvider.getRootElements();
 +    }
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getPropertyPathsMap()
 +     */
 +    @Override
 +    public Map<Object, List<String>> getPropertyPathsMap() {
 +        // TODO Auto-generated method stub
 +        return null;
 +    }
 +
+     @Override
+     public boolean canAttachMedia() {
+         return true;
+     }
  }

diff --combined eu.etaxonomy.taxeditor.navigation/plugin.xml
index 4a2035fdbb1208730de28bdac0e41d426cc114bb,9d828fb455d36b9a94c4fbefd695a12d73f2c5d5..f2c4ab55549f7346579a15dc4d92e591221533aa
--- 1/eu.etaxonomy.taxeditor.navigation/plugin.xml
--- 2/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@@ -87,6 -87,15 +87,15 @@@
                    commandId="eu.etaxonomy.taxeditor.navigation.command.create.taxonNode"
                    label="%command.label.2"
                    style="push">
+                <visibleWhen
+                      checkEnabled="true">
+                   <with
+                         variable="selection">
+                      <count
+                            value="+">
+                      </count>
+                   </with>
+                </visibleWhen>
              </command>
              <separator
                    name="eu.etaxonomy.navigation.menu.new.separator1"
@@@ -275,6 -284,12 +284,12 @@@
                             definitionId="isSynonymNode">
                       </reference>
                    </not>
+                   <with
+                         variable="selection">
+                      <count
+                            value="+">
+                      </count>
+                   </with>
                 </and>
              </visibleWhen>
           </command>
@@@ -477,69 -492,6 +492,69 @@@
              </with>
           </activeWhen>
        </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingChangeAcceptedTaxonToSynonymHandler"
 +            commandId="eu.etaxonomy.taxeditor.navigator.command.update.changeAcceptedToSynonym">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingMoveFactualDataHandler"
 +            commandId="eu.etaxonomy.taxeditor.navigation.moveFactualData">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingMoveTaxonNodeHandler"
 +            commandId="eu.etaxonomy.taxeditor.navigation.command.update.moveTaxon">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.navigation.navigator.handler.RemotingDeleteTaxonNodeHandler"
 +            commandId="eu.etaxonomy.taxeditor.navigation.command.delete">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RemotingDeletePolytomousKeyHandler"
 +            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.command.delete">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RemotingUpdatePolytomousKeyAllNodesHandler"
 +            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.refreshKeyNodes">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.navigation.key.polytomous.handler.RemotingEditPolytomousKeyNodesHandler"
 +            commandId="eu.etaxonomy.taxeditor.navigation.key.polytomous.editNodes">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
     </extension>
  
        
@@@ -779,7 -731,7 +794,7 @@@
           class="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
           id="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
           namespace="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester"
 -         properties="isCdmStoreConnected"
 +         properties="isCdmStoreConnected,isRemoting,isStandAlone"
           type="java.lang.Object">
     </propertyTester>
     </extension>
@@@ -845,18 -797,6 +860,18 @@@
              </test>
           </with>
        </definition>
 +      <definition
 +            id="isRemoting">
 +         <test
 +               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isRemoting">
 +         </test>
 +      </definition>
 +      <definition
 +            id="isStandAlone">
 +         <test
 +               property="eu.etaxonomy.taxeditor.preference.CdmStorePropertyTester.isStandAlone">
 +         </test>
 +      </definition>
     </extension>
     <extension
           point="eu.etaxonomy.taxeditor.store.cdmViewer">

diff --combined eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
index 2f71b0aee3c47b88adc98f395bd25d2a585693ca,f8e789caf1eb1b506a52ed9e2f6d577a481374f2..6dd3d548b0c62a15acc02da283ba8e635b9d346c
--- 1/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
--- 2/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java
@@@ -34,6 -34,7 +34,6 @@@ import eu.etaxonomy.cdm.model.taxon.Cla
  import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
  import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
 -import eu.etaxonomy.taxeditor.model.AbstractUtility;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
  import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
  import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
@@@ -63,12 -64,6 +63,12 @@@ public class DeleteHandler extends Abst
  
                TreeSelection selection = (TreeSelection) HandlerUtil.getCurrentSelection(event);
  
 +
 +              String plural = selection.size() > 1 ? "s" : "";
 +              // Prompt user for confirmation
 +
 +
 +
                Iterator selectionIterator = selection.iterator();
                Set<ITaxonTreeNode> treeNodes = new HashSet<ITaxonTreeNode>();
  
@@@ -130,7 -125,7 +130,7 @@@
                                        }else{
                                                if(!DeleteConfiguratorDialog.openConfirmWithConfigurator(configNodes, HandlerUtil.getActiveShell(event), "Confirm Deletion", "Do you really want to delete the selected node?")){
                                                        return null;
-                                               } 
+                                               }
                                                config.setTaxonNodeConfig(configNodes);
                                        }
                                }
@@@ -139,17 -134,11 +139,17 @@@
                                        /*if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Do you really want to delete the selected nodes?")){
                                                return null;
                                        }*/
 -                                              operation = new DeleteOperation(
 -                                                              event.getCommand().getName(), NavigationUtil.getUndoContext(),
 -                                                              taxonNode, config, taxonNavigator, taxonNavigator);
  
 -                                              AbstractUtility.executeOperation(operation);
 +                                              operation = new DeleteOperation(event.getCommand().getName(),
 +                                                      NavigationUtil.getUndoContext(),
 +                                                              taxonNode,
 +                                                              config,
 +                                                              taxonNavigator,
 +                                                              taxonNavigator,
 +                                                              taxonNavigator);
 +
 +                                              NavigationUtil.executeOperation(operation);
 +
                                                //}
                                }
  
@@@ -157,6 -146,8 +157,8 @@@
  
                        } catch (NotDefinedException e) {
                                MessagingUtils.warn(getClass(), "Command name not set");
+                       } catch (Exception e){
+                           MessagingUtils.error(getClass(), e);
                        }
                } else{
                        try{
@@@ -164,21 -155,17 +166,23 @@@
                                        return null;
                                }
                                if (allEditorsClosed){
 -                                      operation = new DeleteOperation(
 -                                                      event.getCommand().getName(), NavigationUtil.getUndoContext(),
 -                                                      treeNodes, new TaxonDeletionConfigurator(), taxonNavigator, taxonNavigator);
  
 -                                      AbstractUtility.executeOperation(operation);
 +                                      operation = new DeleteOperation(event.getCommand().getName(),
 +                                              NavigationUtil.getUndoContext(),
 +                                                      treeNodes,
 +                                                      new TaxonDeletionConfigurator(),
 +                                                      taxonNavigator,
 +                                                      taxonNavigator,
 +                                                      taxonNavigator);
 +
 +                                      NavigationUtil.executeOperation(operation);
 +
                                }
                        }catch (NotDefinedException e) {
                                MessagingUtils.warn(getClass(), "Command name not set");
-                       }
+                       } catch (Exception e){
+                 MessagingUtils.error(getClass(), e);
+             }
                }
                return null;
        }

diff --combined eu.etaxonomy.taxeditor.store/plugin.xml
index 1ccc50cf20abd3363f8b238f03ace3f42312ca06,320968a8ba32cac8b9abdb71a6e7b08e4d0451ce..fb44e4eda1880887a311e3d276d9501cad7760e3
--- 1/eu.etaxonomy.taxeditor.store/plugin.xml
--- 2/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@@ -206,11 -206,11 +206,11 @@@
              id="eu.etaxonomy.taxeditor.preference.defaultlanguagepditorpreferencePage"
              name="%page.name.30">
        </page>
-       <page
+        <page
              category="eu.etaxonomy.taxeditor.preferences.general"
              class="eu.etaxonomy.taxeditor.preference.OrderPreferences"
-             id="eu.etaxonomy.taxeditor.preference.OrderPreferencesPage"
-             name="%page.name.31">
+             id="eu.etaxonomy.taxeditor.preference.TaxonNavigator"
+             name="%page.name.32">
        </page>
     </extension>
     <extension
@@@ -270,13 -270,6 +270,13 @@@
          id="eu.etaxonomy.taxeditor.view.derivateSearch.DerivateSearchView"
          name="%view.name.6"
          restorable="true">
 +  </view>
 +  <view
 +        allowMultiple="false"
 +        class="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"
 +        id="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart"
 +        name="Sessions"
 +        restorable="false">
    </view>
     </extension>
     <extension
@@@ -375,15 -368,6 +375,15 @@@
                    </reference>
                 </visibleWhen>
              </command>
 +            <command
 +                  commandId="org.eclipse.ui.views.showView"
 +                  label="Sessions"
 +                  style="push">
 +               <parameter
 +                     name="org.eclipse.ui.views.showView.viewId"
 +                     value="eu.etaxonomy.taxeditor.view.sessions.SessionsViewPart">
 +               </parameter>
 +            </command>
           </menu>
        </menuContribution>
        <menuContribution
@@@ -392,32 -376,10 +392,32 @@@
        </menuContribution>
        <menuContribution
              locationURI="menu:org.eclipse.ui.main.menu.file?after=eu.etaxonomy.taxeditor.application.filemenu.io">
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow"
 +               label="Connect"
 +               style="push">
 +         </command>
           <command
                 commandId="eu.etaxonomy.taxeditor.store.operations.showLoginWindow"
                 label="%command.label.5"
                 style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isUserLoggedIn">
 +               </reference>
 +            </visibleWhen>
 +         </command>
 +         <command
 +               commandId="eu.etaxonomy.taxeditor.store.operations.reconnect"
 +               label="Re-Connect"
 +               style="push">
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <reference
 +                     definitionId="isUserLoggedIn">
 +               </reference>
 +            </visibleWhen>
           </command>
           <separator
                 name="eu.etaxonomy.taxeditor.application.filemenu.login"
@@@ -626,8 -588,12 +626,8 @@@
           </activeWhen>
        </handler>
        <handler
 -            class="eu.etaxonomy.taxeditor.handler.ShowLoginWindowHandler"
 -            commandId="eu.etaxonomy.taxeditor.store.operations.showLoginWindow">
 -         <enabledWhen>
 -            <reference
 -                  definitionId="isUserLoggedIn">
 -            </reference></enabledWhen>
 +            class="eu.etaxonomy.taxeditor.handler.ShowRemotingLoginWindowHandler"
 +            commandId="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow">
        </handler>
        <handler
              class="eu.etaxonomy.taxeditor.handler.OpenPasswordWizzardHandler"
@@@ -646,15 -612,6 +646,15 @@@
              </reference>
           </activeWhen>
        </handler>
 +      <handler
 +            class="eu.etaxonomy.taxeditor.handler.SwitchUserHandler"
 +            commandId="eu.etaxonomy.taxeditor.store.operations.showLoginWindow">
 +         <activeWhen>
 +            <reference
 +                  definitionId="isRemoting">
 +            </reference>
 +         </activeWhen>
 +      </handler>
     </extension>
     <extension
           name="%extension.name.0"
@@@ -695,19 -652,9 +695,19 @@@
              name="%command.name.3">
        </command>
        <command
 +            defaultHandler="eu.etaxonomy.taxeditor.handler.ShowLoginWindowHandler"
              id="eu.etaxonomy.taxeditor.store.operations.showLoginWindow"
              name="%command.name.4">
        </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.store.operations.showRemotingLoginWindow"
 +            name="Connect">
 +      </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.handler.ReconnectHandler"
 +            id="eu.etaxonomy.taxeditor.store.operations.reconnect"
 +            name="Re-Connect">
 +      </command>
        <command
              defaultHandler="eu.etaxonomy.taxeditor.editor.definedterm.handler.OpenDefinedTermEditorHandler"
              id="eu.etaxonomy.taxeditor.store.openDefinedTermEditor"
@@@ -750,11 -697,11 +750,16 @@@
              id="eu.etaxonomy.taxeditor.editor.definedTerms.delete"
              name="%command.name.14">
        </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.handler.OpenInspectSessionsHandler"
 +            id="eu.etaxonomy.taxeditor.store.open.InspectSessionsDialog"
 +            name="Inspect Active Session">
 +      </command>
+       <command
+             defaultHandler="eu.etaxonomy.taxeditor.handler.OpenHandler"
+             id="eu.etaxonomy.taxeditor.store.open"
+             name="%command.name.15">
+       </command>
     </extension>
     <extension
           point="org.eclipse.ui.importWizards">

diff --combined pom.xml
index a8e60f966bfd7e7ae74ffab0b89f8e8d3b83d99d,44ff82a0435db2349a683eb4e550959c0dfce9c0..b8308b9c27860f443edda5c9bbd1811280c65b6f
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <prerequisites>
      <maven>3.0</maven>
@@@ -23,7 -23,6 +23,7 @@@
      <tycho.version>0.22.0</tycho.version>
      <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
 +    <unitils.version>3.4.2</unitils.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@@ -450,5 -449,4 +450,5 @@@
        </url>
      </repository>
    </distributionManagement>
 +
  </project>