The API should assign order numbers to new orders - TRUNK-4163
Removing commented out lines for: The API should assign order numbers to
new orders - TRUNK-4163
Changing order number incrementing strategy from memory to database for:
The API should assign order numbers to new orders - TRUNK-4163
Cleared all methods from OrderService
[#TRUNK-4130] Add numedRefills and administrationInstructions properties to DrugOrder

TRUNK-4130 seperated the previous changeset into two for each column and fixed some other small issues
Fix failing unit tests on 1.10.x - TRUNK-4182
Updated the Drug.java and Drug.hbm.xml to include references to the new DrugReferenceMap class. - TRUNK-4143
Merge branch '1.10.x' of github.com:openmrs/openmrs-core into 1.10.x

Merge with upstream.