TRUNK-2658: Javascript errors on patient dashboard in firefox
Merge pull request #607 from lrozanski/TRUNK-2658

TRUNK-2658: Javascript errors on patient dashboard in firefox
TRUNK-3644 Define which resources to load for module based on OpenMRS version

(cherry picked from commit a47d42ebf0fdea8084ff8c42e26591de05efa962)
TRUNK-3644 Added missing file
TRUNK-4025, backport liquibase fixes to 1.9.x
Merge pull request #623 from cioan/TRUNK-4025

TRUNK-4025, backport liquibase fixes to 1.9.x
TRUNK-3909, backport edit_privileges liquibase changes
Merge pull request #627 from cioan/TRUNK-3909

TRUNK-3909, backport edit_privileges liquibase changes
TRUNK-3644 Strip off qualifier when comparing versions
TRUNK-3850
Merge pull request #642 from suraj5/TRUNK-3850

TRUNK-3850
Revert "TRUNK-3850"

This reverts commit 956e3f526fdf165f60c89ea18239dbd00df49915.
TRUNK-4251: Patient dashboard issue when using french locale
Merge pull request #699 from alexisduque/TRUNK-4251

TRUNK-4251: Patient dashboard issue when using french locale
TRUNK-4300 - OpenmrsCookieThemeResolver should never throw an exception, because that would break the uncaughtException page

(cherry picked from commit cf9f6e1f29d66fab9e80ffc7723f461fa3327b22)
TRUNK-4325 Randomly failing tests in ShortPatientFormControllerTest

(cherry picked from commit 13c0dab4d28f17a92935ea7a9571945dc49bf227)

Conflicts:
	web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormController.java
TRUNK-3882 Custom tag to render errors
Merge pull request #787 from jkondrat/TRUNK-3882

TRUNK-3882 Custom tag to render errors
TRUNK 4281: translate hard coded messages for cohorts
Merge pull request #809 from ehsdev/1.9.x

TRUNK 4281: translate hard coded messages for cohorts