Ugly stacktrace when trying to upload a non-image file as a complex obs with the ImageHandler - TRUNK-2652
Ugly stacktrace when trying to upload a non-image file as a complex obs with the ImageHandler - TRUNK-2652
Location hierarchy should not allow loops, description should not be required - TRUNK-2707

Removed stray comment in code - TRUNK-2707
Automated Error Report: NumberFormatException on AddPersonController -
TRUNK-2751

Automated Error Report: NumberFormatException on AddPersonController - TRUNK-2752

Applying auto format - TRUNK-2751

Added a unit test to ensure that things work fine for a valid birthdate - TRUNK-2751
NonUniqueObjectException: a different object with the same identifier value was already associated with the session: [org.openmrs.Patient#] - TRUNK-3728

NonUniqueObjectException: a different object with the same identifier value was already associated with the session: [org.openmrs.Patient#] - TRUNK-3728
Search for patient by identifier fails when identifier is made of only letters - TRUNK-3822

Search for patient by identifier fails when identifier is made of only letters - TRUNK-3822
Applying auto format changes
Back porting to 1.8.x: @StartModule does not work - TRUNK-3508
Back porting to 1.8.x: Home Key doesn't work in the search boxes -
TRUNK-3220
Back porting wyclif's changes for including tests to improve the logic …
for selecting the preferred name - TRUNK-3232
Back porting: Concept search should display the name containing all word
tokens when multiple words are entered - TRUNK-3232
TRUNK-3944: Incorrect mockito, hamcrest and junit dependencies
(cherry picked from commit 0a53179f51b24a43b53717b76172e0e074710035)

Conflicts:
	pom.xml
	test/pom.xml
TRUNK-3944: Updated junit to 4.11 and fixed tests
(cherry picked from commit b2889f14e85ae1f55f763a1c109df4fdb40caf9b)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
TRUNK-3944: Created OpenmrsMatchers
(cherry picked from commit e37a2e967a5130d1846d92f1f2dd3fe8d51b2b8b)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
TRUNK-3944: Responded to review comments
(cherry picked from commit 56c743b869668cef595160db7b6247c9d2c4bde8)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
TRUNK-3944: Responded to more review comments
(cherry picked from commit 171f0cfeaf649a0bc26479b8968001d82d9db934)