@StartModule does not work - TRUNK-3508(cherry picked from commit 332c036938e409de61ee7001332523cca9870a98)
@StartModule does not work - TRUNK-3508(cherry picked from commit 332c036938e409de61ee7001332523cca9870a98)
New visit save errors should not clear new encounter rows - TRUNK-2969(cherry picked from commit 1b9b756c764f2d3ce0003cd2e2be2d657750a583)
Adding missing imports for: New visit save errors should not clear new
encounter rows - TRUNK-2969
Merge branch '1.9.x' of https://github.com/dkayiwa/openmrs-core into 1.9.x
TRUNK-3847(cherry picked from commit 07316639d4c52fd8c2935f6733afdf6f3a3079b9)
TRUNK-3853 and TRUNK-3414
(cherry picked from commit a1230a73ea3f22b2477451eee7fe7987a10a2ed2)
DrugOrderValidator should allow a drug order with either a concept or
drug - TRUNK-3008
Conflicts:
	api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
-adding security to openmrs-api
-adding relationship checks into security context
adding security to DAO
-adding relationship checks, attribute search, safe search for searching patients without checks
-framework for multiple location-based security
-framework for multiple location-based security
-collapsing service/DAO layers in security
-Security for multiple locations
changes in OpenMRS to make it work in EBS (added .ebextention in webapp which calls test.sh). Need more finishing changes
-allowing security between patients (so patients can share records)
Merge pull request #1 from madanpiyush/ebs

changes in OpenMRS to make it work in EBS + CORS
-new security with accessors for security groups. "accessors" are the providers/patients with privilege to see, while the "persons" are able to be viewed