Trello 156 Bug Fix
Merge branch 'develop' of https://github.com/robworth/patientview into develop