[OEM-169] hotfix for deletion of operation notes failing to correctly reset the status of the related operation.
Merge branch 'master' into jira/OEM-169
Merged master into OEM_169
Merge branch 'master' into jira/OEM-169

Conflicts:
	protected/controllers/BaseEventTypeController.php
[OEM-223] User autocomplete action.
Validator to make a field conditionally required based on another field.
Fix RequiredIfFieldValidatorTest (getErrors on the mock will always return null).
Make RequiredIfFieldValidator work with 0s.
[OE-4727] Use reversed name format.
[OE-4727] Order users by last_name, first_name.
[OE-4753] changes to support new booking requirements for scheduling RBAC
[OE-4753] limited scope of widget field type
[OE-4753] bugfix
Merge branch 'jira/OEM-169' into feature/rtt2
[OE-5089] bugfix: primary keys are usually string type rather than integers.
[OE-5089] updated generic admin widget to support generic default selection using radio buttons
[OE-4753] cleanup
[OE-5089] allow setting of no default
Merge branch 'master' into feature/rtt2
Merge branch 'feature/rtt2'

Conflicts:
	protected/assets/css/style.css
	protected/assets/sass/openeyes/components/_forms.scss