[ORB-300] refactored IOL type and size fields
Merge branch 'release/orbis-r2' of github.com:openeyes/OphNuPreoperative into release/orbis-r2

Conflicts:
	models/Element_OphNuPreoperative_PreoperativeAssessment.php
	views/default/print_Element_OphNuPreoperative_PreoperativeAssessment.php