Fixed onTouchBegin/end
Merge branch 'master' of https://github.com/rchen95/cocos2d-js