Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into actualBranch

diff --combined eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index ef365a8ec60eeee2293c100585813dc78d4458cf,a792ed4d3c5da5a9b02325a61fc53c8ef6079145..90a1dc935a1bca6b39b0ea00d3786b1e10ef45ce
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@@ -53,14 -53,12 +53,14 @@@ public class NewTaxonNodeWizard extend
              Taxon taxon = taxonNodePage.getTaxon();
              try{
                  TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
 +
                  if(CdmStore.getCurrentSessionManager().isRemoting()) {
-                     taxonNode = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
+                     taxonNode = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
                  } else {
                      taxonNode = CdmStore.getService(ITaxonNodeService.class).save(taxonNode);
                  }
                  generatedTaxonNodeUuid = taxonNode.getUuid();
 +
                  Set<CdmBase> affectedObjects = new HashSet<CdmBase>();
                  //FIXME:Remoting Hack for now - need to generalise this
                  // by making the affected objects a set of ICdmBase