merge from trunk

diff --cc .gitattributes
Simple merge

diff --cc cdmlib-remote-webapp/ide/eclipse/cdmlib-remote-webapp - run.launch
index 0d6d96fdb437134e48219eacc793ea8deacf0d41,0d6d96fdb437134e48219eacc793ea8deacf0d41..30817b922601953e4a8d9be4029d57f8b89cac38
--- 1/cdmlib-remote-webapp/ide/eclipse/cdmlib-remote-webapp - run.launch
--- 2/cdmlib-remote-webapp/ide/eclipse/cdmlib-remote-webapp - run.launch
+++ b/cdmlib-remote-webapp/ide/eclipse/cdmlib-remote-webapp - run.launch
@@@ -10,7 -10,7 +10,7 @@@
  <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="RunJettyRunWebAppClassPathProvider"/>
  <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="runjettyrun.Bootstrap"/>
  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cdmlib-remote-webapp"/>
--<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M&#13;&#10;-Dlog4j.configDebug=true&#10;-Dorg.mortbay.jetty.webapp.parentLoaderPriority=true"/>
++<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx500M&#13;&#10;-Dlog4j.configDebug=true&#10;-Dorg.mortbay.jetty.webapp.parentLoaderPriority=true&#10;-Dspring.profiles.active=remoting"/>
  <stringAttribute key="run_jetty_run.CONTEXT_ATTR" value="/"/>
  <booleanAttribute key="run_jetty_run.ENABLE_JNDI_ATTR" value="false"/>
  <booleanAttribute key="run_jetty_run.ENABLE_MAVEN_TEST_CLASSES_ATTR" value="true"/>

diff --cc cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
index ff0e79f779fbb718684b0b9915d42c48ce070c6d,122d56c205e57215e315e16a509d88d9560ee7fd..02e630b991e9838b43c4a679b6a89d401b1902b0
--- 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
@@@ -113,27 -90,11 +113,19 @@@ public interface ITaxonNodeService exte
         */
        public int countAllNodesForClassification(Classification classification);
  
 -      public TaxonNode moveTaxonNode(TaxonNode taxonNode, TaxonNode newParent);
 -
 -
 -
 +    /**
 +     * @param taxonNode
 +     * @param newParentTaxonNode
 +     * @return
 +     */
 +    public TaxonNode moveTaxonNode(TaxonNode taxonNode, TaxonNode newParentTaxonNode);
  
+ 
 +    /**
 +     * @param taxonNodeUuid
 +     * @param newParentTaxonNodeUuid
 +     * @return
 +     */
 +    public TaxonNode moveTaxonNode(UUID taxonNodeUuid, UUID newParentTaxonNodeUuid);
  
- 
- 
- 
- 
- 
- 
- 
- 
- 
  }

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

diff --cc cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
index d292a9e3fa6665524b2c38c3f8176c595b309a9d,d2c1e4a79bb15a8bc96c1d975bdd5870d7df65a2..ca038d6cc97c6fa33d14ee686b76d5db304e3f8c
--- 1/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
--- 2/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
@@@ -682,8 -683,8 +682,8 @@@ public class TaxonServiceImpl extends I
                results = dao.getTaxaByNameForEditor(configurator.isDoTaxa(), configurator.isDoSynonyms(), configurator.isDoNamesWithoutTaxa(), configurator.isDoMisappliedNames(),configurator.getTitleSearchStringSqlized(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas());\r
          }\r
          if (configurator.isDoTaxaByCommonNames()) {\r
 -            \r
 +\r
-             if(configurator.getPageSize() == null ){\r
+             //if(configurator.getPageSize() == null ){\r
                  List<UuidAndTitleCache<IdentifiableEntity>> commonNameResults = dao.getTaxaByCommonNameForEditor(configurator.getTitleSearchStringSqlized(), configurator.getClassification(), configurator.getMatchMode(), configurator.getNamedAreas());\r
                  if(commonNameResults != null){\r
                      results.addAll(commonNameResults);\r