TRUNK-3706: Changed encoding from UTF-8 without BOM to UTF-8 with BOM
TRUNK-3710: Cascade="true" property isn't set on the Encounter object in the Visit hibernate mapping file +Nano
1.9.x
Merge pull request #16 from mogoodrich/1.9.x

TRUNK-3710: Cascade="true" property isn't set on the Encounter object in...
TRUNK-3710: Cascade="true" property isn't set on the Encounter object in the Visit hibernate mapping file +Nano
1.9.x

tweaks some comments, improved unit tests
removed unit test mistakenly backported from master branch
added @since to Visit addEncounter method (TRUNK -3710)
proposed concept queue error when saving as concept
 - TRUNK-3592
Adding gitignore files for module files
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)
Remove an unnecessary log.warn
Merge pull request #30 from djazayeri/1.9.x

Remove an unnecessary log.warn
TRUNK-3151 - Correct null detection. Committed with correct line ending
(cherry picked from commit a2aef97efe9d3d117d4240afc17e2f55f4c95d8c)
Patients names which include a double quote (") are truncated after the
double quote
https://tickets.openmrs.org/browse/TRUNK-3123(cherry picked from commit 720abfea4765a8d9374233abefb6c7628c87f641)

Conflicts:

	webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410
Conflicts:

	webapp/src/main/webapp/WEB-INF/web.xml
Followup commit to fix bad merge for TRUNK-3410
https://tickets.openmrs.org/browse/TRUNK-3410
Revert "Followup commit to fix bad merge for TRUNK-3410"

This reverts commit 3940f04989ae7bb7a5d9dec40017b575c2066988.
Revert "OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410"

This reverts commit edf5f9414989c9dd1001015d24c5fce0b6ed2b70.
manually backporting OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410