TRUNK-2779 clean up patient birthdate error and give proper error message
Merge pull request #616 from vaibhav-hp/TRUNK-2779-new

TRUNK-2779 clean up patient birthdate error and give proper error messag...
RCM-82 If have no results it still shows Displaying 1 to 1 of 1, this should say No results
Merge pull request #620 from vaibhav-hp/RCM-82

RCM-82 If have no results it still shows Displaying 1 to 1 of 1, this sh...
damn
Merge branch 'master' of https://github.com/openmrs/openmrs-core
@lplotni/@puffedo: TRUNK-287 We added a test to the ConceptServiceImplTest verifying that the whitespaces will be trimmed when storing a name of a concept. We also tidied up the imports and some tests.
@lplotni TRUNK-287 Applied the changes.

As discussed with @dkayiwa
Upgrade Spring framework to 3.2.7.RELEASE - TRUNK-3390
Removing a TODO for: Upgrade Spring framework to 3.2.7.RELEASE -
TRUNK-3390
TRUNK-3644 Strip off qualifier when comparing versions

(cherry picked from commit 36f2c8da3e5c32ae836d4bb318d6b445e8062e2a)

Conflicts:
	api/src/main/java/org/openmrs/module/ModuleUtil.java
TRUNK-4250  You can set your default locale message is messed up
Merge pull request #634 from vaibhav-hp/TRUNK-4250

TRUNK-4250  You can set your default locale message is messed up
Merge pull request #632 from lplotni/TRUNK-287-corrected

TRUNK-287
Merge branch 'master' of https://github.com/openmrs/openmrs-core