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...
Upgrade Spring framework to 3.2.7.RELEASE - TRUNK-3390
Removing a TODO for: Upgrade Spring framework to 3.2.7.RELEASE -
TRUNK-3390
Merge branch 'master' of https://github.com/openmrs/openmrs-core into TRUNK-3195
TRUNK-3644 Strip off qualifier when comparing versions

(cherry picked from commit 36f2c8da3e5c32ae836d4bb318d6b445e8062e2a)

Conflicts:
	api/src/main/java/org/openmrs/module/ModuleUtil.java
Merge remote-tracking branch 'upstream/master' into TRUNK-3195