[#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