fix touch event issue!
Merge branch 'dev'