RPV-197 - Fix so the email address can be changed
Merge branch 'develop' of https://github.com/robworth/patientview into develop