Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
[OE-2950] event title moved to controller
[OE-3899] parent guardian field fix
Merge branch 'release/1.5' into develop
Merge branch 'master' into develop

Conflicts:
	views/default/view.php
+ compatability with changes to BaseEventTypeController
+ set defaults for elements outside of the models when dependent on controller submitted values
+ bugfixes
Fix for unbooked procedures.
+ fix the relations for procedure assignments
+ use specific methods for assigning element defaults
+ [OE-3896] API fix after relation changes.
RBAC.
Merge branch 'feature/rbac' into develop
Removed event title (this is now set in the event_container view in core)
fixed model references
[OE-3914] fixed collation
[OE-3731] Adjusted asset paths
[OE-3731] Fixed grunt build
Merge branch 'feature/assets' into develop