fixed unit test
+ update Drug tests for recent changes (discontinued still needs resolving)
Merge branch 'develop' of github.com:openeyes/OpenEyes into develop

Conflicts:
	protected/tests/unit/models/DrugTest.php
[OE-3987] patients should not be deletable
Command to parse the FHIR schema and output JSON.
FHIR schema.
Command to generate constants for FHIR value sets.
FHIR value set constants.
UUID generator.
Data template system.
Base service layer classes.
Base classes for model-based services.
Bundle data object.
FHIR util class.
Category header parser.
API controller.
API testing infrastructure.
Address data object.
GP service.
Commissioning Body Service.