TRUNK-3706: Changed encoding from UTF-8 without BOM to UTF-8 with BOM
TRUNK-3706: Add a comment indicating BOM in the first line
TRUNK-3501: Show helpful message when purging in-use Field Types
(cherry picked from commit e0566b8192ff89c10253d1a1845ccb1458ce6065)
TRUNK-3501: Show helpful message when purging in-use Field Types
(cherry picked from commit a8321808aeea4c3751a467cdcbe170c3af8181a2)
Adding gitignore files for module files
Backported Wyclif's fix for TRUNK-3592
Original commit was f5530585c47ae3de771adca5d3660784655cb01d
TRUNK-3151 - Correct null detection. Committed with correct line ending
(cherry picked from commit a2aef97efe9d3d117d4240afc17e2f55f4c95d8c)
TRUNK-238:Remove Audit Patient Identifiers function
Backported from https://github.com/openmrs/openmrs-core/commit/ec8a03a92af3c8cafecfc76a7bb3417d8b656fda
TRUNK-3489:Deleted program workflows should not appear when adding
patient program
Back porting to 1.8.x: Changed by information not updated when concept
names/synonyms are edited, added or removed - TRUNK-3337
TRUNK-3753: Uses the c:url tag to provide support for external urls, javascript, and local urls (by adding the context path).
(cherry picked from commit d0f269ef0f200215bbcf6c0b45d9b02146ff2e21)
TRUNK-3693: Correct web.xml build date to be locale independent
(cherry picked from commit d77af242bee13ea218558421c08e2ba47e542c24)
TRUNK-3363: synchronize refreshingContextCheck on separate refreshingContextLock object
(cherry picked from commit 74cd4e18641f028aa93ab11add98a0b5ec2882c9)
Fixed formatting
TRUNK-3280:Short patient form should display Relationships only if the
showRelationships GP is set to true
(cherry picked from commit ffe6f8e47642b25a4943cf15a00f0ca5f9523ebd)

Resolved conflicts:

	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
	web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormController.java
TRUNK-2681: Added the NewPassword and ConfirmPassword verification
(cherry picked from commit bd42f7d591b91af32bc29a99ad2786fa57b5a5f6)
Fixed formatting
TRUNK-3287:Incorrect date_created value on edited concept names

TRUNK-3287: set date and creator to null and let the handlers do the
work

Unit test added
(cherry picked from commit d09c3eae36ad57071b141a96bc3edee328b1c5f9)
TRUNK-3723: Not null constraint should be enforced on uuid property in ActiveListItem.hbm.xml file
(cherry picked from commit fb9f998f5a415226a0a2cd5be4c8a7701aefaf4d)
TRUNK-3287: Fixed build