add dummy data function to event controller
minor fixes
Merge branch 'master' of https://github.com/jortegac/eris