+ 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