added @editdelete tag to regression tests
Merge branch 'release/1.6' of https://github.com/openeyes/OpenEyes into release/1.6

Conflicts:
	features/bootstrap/Features/Release1.4 Regression Pack/OperationBooking.feature