merge-update from trunk

diff --combined .gitignore
index 074683469e08c4a0d5b4632b9a11b4499d953467,5c8b928b8e9810e6ba3615b0efdeead665c5c54d..87dc88128e4c55100ba12b0ceb536fcbed647dd4
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -5,43 -5,14 +5,43 @@@ eu.etaxonomy.taxeditor.bulkeditor/.sett
  eu.etaxonomy.taxeditor.bulkeditor/target
  eu.etaxonomy.taxeditor.cdmlib/.directory
  eu.etaxonomy.taxeditor.cdmlib/.settings
 +eu.etaxonomy.taxeditor.cdmlib/META-INF/bin
 +eu.etaxonomy.taxeditor.cdmlib/bin
  eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.jar
  eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.zip
  eu.etaxonomy.taxeditor.cdmlib/dist
 +eu.etaxonomy.taxeditor.cdmlib/lib/bin
  eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib*
  eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.servletbridge.extensionbundle-1.2.0.v20100503.jar
  eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.transforms.hook-1.0.300.v20100719.jar
  eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.weaving.hook-1.0.100.v20110502.jar
  eu.etaxonomy.taxeditor.cdmlib/log4j-1.2.14src.zip
 +eu.etaxonomy.taxeditor.cdmlib/src/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/proxy/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/test/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/bin
 +eu.etaxonomy.taxeditor.cdmlib/src/test/resources/eu/etaxonomy/cdm/datasources/bin
  eu.etaxonomy.taxeditor.cdmlib/target
  eu.etaxonomy.taxeditor.editor/.settings
  eu.etaxonomy.taxeditor.editor/target
@@@ -66,6 -37,6 +66,7 @@@ eu.etaxonomy.taxeditor.store/targe
  eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
  eu.etaxonomy.taxeditor.test/target
  eu.etaxonomy.taxeditor/.settings
++eu.etaxonomy.taxeditor/rcp.target
  eu.etaxonomy.taxeditor/target
  /runtime-taxeditor.product
  /target