EDIT

Removed code which introduced horrible performance problems and phantom commits.

Corrected and added to tests

Updated tests to reflect the new unique uuid constraint, corrected the CacheStrategyGenerator listener to correctly add updatedBy / createdBy metadata on saveOrUpdate events, corrected a couple of DAO methods, and added merge(T t) to ICdmEntityDao to allow the persisting of detached objects

fixes #499

Merged search changes from 2.0

wrapped term initializing in a single transaction thus speeding up startup time

Fixing bug which prevented selection of all description elements, regardless of class

Fixed some issues with database handling and fixed a bug in LocationService.

Fixed name/specimen type designation status mapping

minor