Card #96 edit and new fixes, more robust save
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop-ui