Updated core event system
Updated spelling mistake
Function rename
Fixed bug with merge conflicts
Merge branch 'develop' of https://github.com/adaptlearning/adapt_framework into feature/9086