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
Merge branch 'release/1.5' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
+ First pass at working with the refactored BaseEventTypeController
+ remove debug
+ First pass at working with the refactored BaseEventTypeController
RBAC.
Migration for prescription authitems.
Remove obsolete canPrint method.
Fix typo in print prescription permission
Merge branch 'feature/rbac' into develop
Update for new checkCreateAccess signature.
Merge branch 'master' into develop
fixed references to models
[OE-3914] fixed collation
[OE-3731] Adjusted asset paths