Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
	eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index 90ae5f0ba42c067e8dbc15a8778a4cf3b2db1c7a,e9803317c41e950705fb06318d69b833081b8be8..66d18dee7686e3288fee1dba2a4d4fe7c621516b
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
@@@ -1170,4 -1170,4 +1170,5 @@@ public class TransientDescriptionServic
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
++
  }

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index a74d73b5b471534e37dd3e4ae8cebdad5e984b44,92fbdb1b40174dbec0478b2a48a06542c668de5c..428165d0122e8bfdfbe0de2964bd4555fa431ba8
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@@ -1189,9 -1189,10 +1189,4 @@@ public class TransientNameService imple
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
 -
--
--
--
--
--
  }

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
index 1a6612cb1aa4c5e66f9ea1429404528a82f34c11,3e28bf56c581393f1e46fc53856b4e267c072d98..399b42bb235a433a91c30cf65d5537e10efa2262
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
@@@ -725,6 -725,6 +725,4 @@@ public class TransientReferenceService 
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
--
--
  }

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index 49237b718fb3a515cb7ac8de96aed44b1ef4c938,08c3e7ecb1439b5fe3e32566b855ee10fb911b18..5692a93f17a3c5e3dbabb5b1e038b3f1d2cca0db
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@@ -1480,5 -1477,5 +1480,4 @@@ public class TransientTaxonService impl
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
--
  }

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
index c3251691d24f762be42a1660568d98967182b134,48c3673e87fce994049604e22a350c443bc41005..4cbef62c457f80dc5178efff2033c15363a4a155
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@@ -887,6 -887,6 +887,4 @@@ public class TransientTermService imple
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
--
--
  }

diff --cc eu.etaxonomy.taxeditor.navigation/plugin.xml
Simple merge