added short names for drugs and changed arrangement of columns on reports
added short names for drugs and changed arrangement of columns on reports
merged conflict