proposed concept queue proposed concept text did not get saved to
dictionary correctly - TRUNK-3593
Merge branch 'master' into TRUNK-3593
OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410
Merge pull request #33 from wluyima/TRUNK-3410

OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410
[Isha] TODO for PersonName.toString(),replaced all usages and modified implementation as required
[Isha] Modified implementation of Provider.toString()
TRUNK-3706: Installation assistant not showing correct encoding
applying auto format changes
Merge branch 'master' of https://github.com/openmrs/openmrs-core
TRUNK-3321B 
In the AdministrationServiceImpl.validate method, throw an APIException
if the input is null.
Can't save concepts with two new concept reference terms
https://tickets.openmrs.org/browse/TRUNK-3745
and
https://tickets.openmrs.org/browse/META-261
TRUNK-3744: Unable to delete global properties in 1.9.x+
TRUNK-3750 - TestOrder.specimenSource should be FKd to concept, not just a plain integer
TRUNK-3748 - TestOrder.laterality should be an enum with LEFT, RIGHT, and BILATERAL (not an integer)
TRUNK-3747 - Add urgency to orders table and give default value for orders.urgency in liquibase, so it can be applied to existing databases
Added @since to ConceptReferenceTerm - followup to TRUNK-3745
https://tickets.openmrs.org/browse/TRUNK-3745
Abstracted out the access to fetch the implementation id so that the tests pass.
TRUNK-3719: "Manage Forms" visible to all users under Administration
TRUNK-3720: check View Current Users privilege to display link
Around 68% hindi translation completed. Self review is still pending.
Merge branch 'mymaster' of https://github.com/zabil/openmrs-core into zabil-mymaster
Applying Ben's code review comments to Zabil's changes from a2e350f8f3291e854cd1e198ef593c109e213047