Removed redundant collation
Fixed events relation
Merge branch 'release/1.5' of github.com:openeyes/OpenEyes into release/1.5