+ [OE-3308] restrict ward options for booking to wards relevant to patient restrictions and theatre location. Do not allow booking with no ward assignment.
+ beginnings of tests for Element_OphTrOperationbooking_Operation
[OE-4071] Remove references to contact_type.
[OE-3984] fixed error on delete page
[OE-3945] Fixed import paths and initial print related amends
[OE-3945] Fixing layout
[OE-3945] Print updates
[OE-3945] Using wrapper views for elements and other print related changes
Merge branch 'feature/print' into develop
[OE-4069] Fix audit calls for scheduling options.
Merge branch 'release/1.6' into develop

Conflicts:
	controllers/AdminController.php
	tests/fixtures/ophtroperationbooking_operation_ward.php
	views/booking/_list.php
Merge branch 'develop' into jira/3987