Added ethnicity to risks (resolves OE-2565)
Add option to IOP instruments
Add display_order to IOP instruments
Allow subspecialty specific attribute options (resolves OE-2563)
[OE-2561] removed seconds from the time field in the dilation element.
Initial CCT child element
Recombine element forms
Add method to Anterior Segment CCT child element
Merge branch 'release/1.2-moorfields' into feature/glaucoma

Conflicts:
	views/default/form_Element_OphCiExamination_Dilation.php
Removed redundant js (moved to core)
Add other option and comments to Risks element
Use new toolbar format
Use help toolbar with PS too
Change optional elements markup to match nestedelements js
Remove redundant css
Enable import previous on Anterior and Posterior Segment elements
Enable import on OpticDisc and Refraction
Merge branch 'feature/glaucoma' into feature/dr-function

Conflicts:
	assets/css/module.css
	assets/js/module.js
	controllers/DefaultController.php
	views/default/form_Element_OphCiExamination_Management.php
	views/default/form_Element_OphCiExamination_PosteriorSegment_OEEyeDraw.php