Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
Merge branch 'release/1.5' into develop
Merge branch 'master' into develop
+ update to create view file for controller refactor
Remove unused canPrint() check.
Merge branch 'feature/rbac' into develop
Remove event titles (moved to core).
[OE-3914] fixed collation
[OE-3731] Adjusted asset paths
[OE-3731] Fixed grunt build
Merge branch 'feature/assets' into develop
Merge branch 'hotfix/OEM-109' into release/1.6

Conflicts:
	views/default/delete.php
	views/default/view.php
[OEM-109] added form declaration
[OEM-109] cleaned up form
Merge branch 'master' into release/1.6
[OE-4010] fixed table names
[OE-4010] updated table names
[OE-4010] fixed model names
[OE-3984] fixed error on delete page