Support for prescribing brand medicines - TRUNK-4379

Conflicts:
	api/src/main/resources/liquibase-update-to-latest.xml
	api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
	api/src/test/resources/org/openmrs/include/standardTestDataset.xml

Updated files