[ORB-121] progress notes
[ORB-121] progress notes
[ORB-121] clean up
[ORB-121] clean up
[ORB-121] cleanup
[ORB-175] decimal vital type
[ORB-122] fixed typo
Merge branch 'release/orbis-r1' of github.com:openeyes/OphNuPostoperative into release/orbis-r1
[ORB-218] removed templates
[ORB-175] glucose migration fix
[ORB-124] fixed label text
Merge branch 'release/orbis-r1' of github.com:openeyes/OphNuPostoperative into release/orbis-r1
Merge branch 'develop' into release/orbis-r1
[ORB-121] timestamp notes
Merge branch 'release/orbis-r1' into release/orbis-r2

Conflicts:
	views/default/form_Element_OphNuPostoperative_PostOperativeProgressNotes.php
	views/default/view_Element_OphNuPostoperative_PostOperativeProgressNotes.php