EDIT

Add vocabulary list method by term types #3843

Merge branch 'ticket-5066' into develop

Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java

minor clean ups

Adapt listeners and tests to new pre-insert strategy #5066

Add new merge method for root entitites which returns the newly created MergeResult object

Merge branch 'develop' into ticket-5066

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java

Add commented code for copying properties

Set transient id for root merge object

resolving conficts in project versions after hotfixrelease

#5288 - avoiding unncessary entitiy loading, using uuid instead in dao methods