Merge branch 'develop' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java

diff --cc eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index b613952f6386f4d41a3d175a9b4114dd9973b49c,ee3cd44efb078430a6d24fdee4cd1db9eb08a8a1..9f3dbc63aa2fab335b2b1973e3434c209f7da1fa
--- 1/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
--- 2/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@@ -63,7 -67,7 +67,7 @@@ import eu.etaxonomy.taxeditor.view.Abst
   * @created 08.07.2009
   * @version 1.0
   */
--public class ReferencingObjectsView extends AbstractCdmViewPart{
++public class ReferencingObjectsView extends AbstractCdmViewPart {
        private static final Logger logger = Logger
                        .getLogger(ReferencingObjectsView.class);