EDIT

Resolve merge conflict

Fix label

Merge branch 'hotfix/3.12.4' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java - resolved
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java - UNRESOLVED!!!!!

#5533 writing and reading cdmserver configuration from and to JSON file

classpath updates

#5533 reading/writing remote server config from/to json

Updated version in pom / project files to taxeditor version : 3.12.4 and cdmlib version : 3.12.4

fix the merge conflicts of hotfix branch

Merge branch 'hotfix/3.12.3'

fix entity already associated with another entity bug