fixed event
fixed some event problems
Merge branch 'develop'