Merge branch 'tc'
modify add event
Merge branch 'master' into tc