Added more event types
Merge branch 'master' of github.com:TBITracker/taskplanner