fixed mismatched foreign key constraints.
Merge branch 'release/1.5' into develop
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 'develop' of https://github.com/openeyes/OphCoCorrespondence into develop
Merge branch 'release/1.5' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
+ base event type controller refactor
+ comment updates
RBAC.
Merge branch 'feature/rbac' into develop
[OE-3914] fixed collation
[OE-3731 Adjusted asset paths
[OE-3731] Fixed asset references
[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