TRUNK-3723: Not null constraint should be enforced on uuid property in ActiveListItem.hbm.xml file
(cherry picked from commit fb9f998f5a415226a0a2cd5be4c8a7701aefaf4d)
TRUNK-3504: ProgramWorkflowService.getProgramByName does not look at Program.name
TRUNK-3504: Added since
TRUNK-3504: Added since to Program
Reverted TRUNK-3504 back port
TRUNK-3784: NPE when starting/stopping a module
(cherry picked from commit 4b954e97e88110e10a8d65b6d5f590be48ff66bf)
TRUNK-3778: Add support for JPA annotations

Resolved conflicts:

	api/src/main/java/org/openmrs/api/db/hibernate/HibernateSessionFactoryBean.java
TRUNK-3778: Added javadocs
TRUNK-3804 - Merge Patients ignores visits (also, increase memory when running unit tests)
Revert "TRUNK-3804 - Merge Patients ignores visits (also, increase memory when running unit tests)"

This reverts commit 4b018f7577e7c680504482f475fdfebd423e30fe. (which accidentally changes line endings)
Trying again, to avoid modifying line endings. TRUNK-3804 - Merge Patients ignores visits (also, increase memory when running unit tests)
Back ported - Made small fix to search widgets not look up the selected
item from the array of results on click
Back ported - Made small fix to search widgets not look up the selected
item from the array of results on click
TRUNK-3632 - git commit id used as buildnumber(cherry picked from commit 8dbd4d1730d9aa8cc2ad6728980a78af6a2de7fa)
TRUNK-3196: Create JUnit test for HibernateFormDAO.getFormCriteria's
containingAllFormFields parameter
(cherry picked from commit 99fb3b2bc45d514ed18b10b59885c20a6327b03e)

Resolved conflicts:

	api/src/main/java/org/openmrs/api/FormService.java
Merge branch '1.9.x' of https://github.com/openmrs/openmrs-core into 1.9.x
TRUNK-3486:typeMismatch error when saving concept
QueryException received while searching for concepts through ConceptService

Checking results of test & added extra tests to check regular method behaviour

Removing stray includes from bas merge - TRUNK-3812

Follow up to address review changes
applying auto format changes
QueryException received while searching for concepts through ConceptService

Checking results of test & added extra tests to check regular method behaviour

Removing stray includes from bas merge - TRUNK-3812

Follow up to address review changes

applying auto format changes