Added generic Event class above all events.
Merge branch 'master' into demo