Revert "Merging order-entry to trunk rev:20830 - rev:28000"

This reverts commit e617b404d5f2b70187331158dcd7db08311a2b1f.

Conflicts:
	api/src/main/java/org/openmrs/BaseOrderable.java
	api/src/main/java/org/openmrs/Drug.java
	api/src/main/java/org/openmrs/GenericDrug.java
	api/src/main/java/org/openmrs/Order.java
	api/src/main/java/org/openmrs/TestOrder.java
	api/src/main/java/org/openmrs/api/OrderService.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
	api/src/main/java/org/openmrs/api/handler/OrderSaveHandler.java
	api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
	api/src/main/java/org/openmrs/order/OrderUtil.java
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
	api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
	api/src/main/java/org/openmrs/validator/OrderValidator.java
	api/src/main/resources/liquibase-update-to-latest.xml
	api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
	api/src/test/java/org/openmrs/api/OrderServiceTest.java
	api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
	api/src/test/resources/org/openmrs/include/standardTestDataset.xml
	api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
	web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
	web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java
	webapp/src/main/webapp/WEB-INF/messages.properties
	webapp/src/main/webapp/WEB-INF/tags/orderableField.tag
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
	webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
Fixed failing test due to test data set that doesn't match the data model
Applying auto format changes
Removed un needed changeset related to order entry since we reverted order entry work committed in master before 1.10