EDIT

#5297 Refactor ProgressMonitorController, Add Remoting Progress monitor

#5297 Add progress monitor service, Add test services

#5297 Add monit import method

#5297 Update no. of work units

#5297 Add new thread class for remoting monitors

#5297 Add owner field to monitor thread and user checks in service...

Minor cleanup

Fix test in dataportal with strict bean initalization #5077

Revert "minor"

This reverts commit 64367d007ba404e037ccc2b6794b46c4f1f321bc.

minor

Fix bean read/write inconsistency in Taxon and TaxonBase #5307

fix #5179 and adapting the tests because the classification argument is needed now

accept the change from a number to null in TimePeriod fields #5319

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