added bubbling to event dispatcher
Merge branch 'master' into ui