merge trunk to branch

diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index db8f5d25e7ed8d749ae9e218dda12fd281acb68d,db8f5d25e7ed8d749ae9e218dda12fd281acb68d..b846a1be86c6d270e9045a20d25fd6b4d5ca1282
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -8,7 -8,7 +8,7 @@@
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.11-SNAPSHOT.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.11-SNAPSHOT.jar"/>\r
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.0.11-SNAPSHOT.jar"/>\r
--      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.11-SNAPSHOT.jar"/>\r
++      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.0.11-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.0.11-SNAPSHOT-sources.jar"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry exported="true" kind="lib" path="lib/activation-1.1.jar" sourcepath="lib/activation-1.1src.zip"/>\r