demo dir
修复eventhandler的测试用例
事件bug修复
Merge remote-tracking branch 'jm/dev' into dev