merge-update from trunk

diff --cc .gitattributes
Simple merge

diff --cc cdmlib-model/pom.xml
Simple merge

diff --cc cdmlib-remote-webapp/ide/eclipse/cdmlib-remote-webapp - run.launch
index 89bf96865d3bb7a8303c6092b8bceb1f17e391b1,0d6d96fdb437134e48219eacc793ea8deacf0d41..4465f13a2c769fffc5d9ee3898f4dbcd890bcfdf
--- 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&#10;-Dcdm.datasource=mySql3.4"/>
 -<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;-Dcdm.datasource=CompleteDerivateHierarchy"/>
  <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/pom.xml
Simple merge

diff --cc pom.xml
Simple merge