Merge branch 'master' into release/1.7

Conflicts:
	views/default/_form.php
	views/default/_previous.php
+ bugfix for workflow step view
[OE-4006] - created glaucoma management migration
[OE-4006] - remove clinical outcome from migration and fix class name module namespace for element
[OE-4006] - adding models for elements attributes in migration
[OE-4006] - fix element type removal in migration
[OE-4006] - completed overall management including adding dropdown data form and view
[OE-4006] - added elements parents id and ordering Overall Periods in the dropdowns
[OE-4006] - migration and models changes
[OE-4006] - tmp commit, current management plan in progress
[OE-4006] -  current management plan more form changes
[OE-4006] -  current management plan more more form changes
[OE-4006] - add drop down values Plus more current management plan form changes
[OE-4006] - completed current management plan view changes
Merge branch 'develop' into jira/OE-4006
[OE-4006] - added target iop validation rule plus initial version that checkes previous iop readings
changes to forms classes too
[OE-4006] - completed form js for current management iop
Fix class case
+ [OE-3969] fix clear button for colour vision element
Merge branch 'develop' of github.com:openeyes/OphCiExamination into develop