Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
	cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

diff --cc cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
index 896bf1cbf8f29034f771945b6c1dd53226ab460c,b6d8aa8bb7503b9ae07fac9b909fed8a2fdf5502..896bf1cbf8f29034f771945b6c1dd53226ab460c
mode 100755,100644..100644
--- 1/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
--- 2/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java

diff --cc cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
index 612abe3d48357ccdf63f841872d5070ceb89332a,5142b06c01d1b9ad87b3e7086d5b951a9b5bf43f..0909ab1cbafdf97a5b7283be8d8f4a2cddf08fcb
mode 100755,100644..100755
--- 1/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
--- 2/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

diff --cc cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
index 387ac0ee259cd3819bbfcd1dc1aad4f21801784a,30d656dcbaacbef6a0dbcc73ee03ed1f8f4afdc1..cb1336521777c1a2ad08f0446b59a1b588fac73e
--- 1/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
--- 2/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
@@@ -43,8 -43,10 +43,9 @@@ import eu.etaxonomy.cdm.model.name.Taxo
  import eu.etaxonomy.cdm.model.reference.Reference;
  import eu.etaxonomy.cdm.model.taxon.Classification;
  import eu.etaxonomy.cdm.model.taxon.HomotypicGroupTaxonComparator;
+ import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
  import eu.etaxonomy.cdm.model.taxon.Synonym;
 -import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 -import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 +import eu.etaxonomy.cdm.model.taxon.SynonymType;
  import eu.etaxonomy.cdm.model.taxon.Taxon;
  import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  import eu.etaxonomy.cdm.model.taxon.TaxonNodeAgentRelation;

diff --cc cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
Simple merge

diff --cc cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
Simple merge

diff --cc cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java
Simple merge