Merge branch 'master' into release/1.7

Conflicts:
	views/default/_form.php
	views/default/_previous.php
+ bugfix for workflow step view
Merge branch 'develop' into release/1.7
Merge branch 'develop' into release/1.7
[OE-4245] Visual Acuity element relabelled Visual Function
[OE-4250] ORA added to IOP
[OE-4237] Restrict the amount of icons to display in a toolbar panel.
Merge branch 'release/1.7' of https://github.com/openeyes/OphCiExamination into release/1.7
[OE-4237] Removed bound fields for anterior segment element.

These fields are now handled within the doodle popup.
[OE-4254] Use dropdown for target IOP.
[OE-4252] HFA renamed Visual Fields