This should ensure that all events have entities attached to them
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev