merge-update from trunk

diff --cc .gitignore
index 074683469e08c4a0d5b4632b9a11b4499d953467,5c8b928b8e9810e6ba3615b0efdeead665c5c54d..87dc88128e4c55100ba12b0ceb536fcbed647dd4
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -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