Card #479 - fix for drug end of list
Card #479 - fix for patient details (get details from second if present and first has null values), remove edta manager injection
Merge pull request #161 from PatientView/479-looking-local

479 looking local changes from Tony review 2