Fixes event bug and underscore updated
Merge pull request #493 from adaptlearning/event-bug

Fixes event bug and underscore updated