Nadims email - changes to the fields for patientview
Merge remote-tracking branch 'origin/develop' into develop