EDIT

#4073 Initial implementation of local cdm-server

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java...

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

changes for move descriptions and description elements

Remove comments

Rename Derivative View to Derivative Editor

fix jenkins

minor

fix delete polytomouskeynode and improve merge in bulk editor

#5130 Extend import wizards to import data via remoting and Add tests for the same