EDIT

Correct properties file load and server info test

Add entity type to CdmChangeEvent and fixes #5139

#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...

#4717 Correct java exec called for macosx

#4717 Correct macosx dir structure

#4717 Correct macosx java path

#4717 Correct dir relative path to java exec for mac osx

#4717 Correct dir for changing permissions

#4717 Add seperate product file for jre bundle