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