Fix issue that error return from function onTouchBegan
issue #5281: add presentation in jsb test
issue #5281: fix socket.io disconnect bug
issue $5281: fix disconnect bug
Merge pull request #402 from joshuastray/master

issue #5281: fix socket.io disconnect bug and add presentation in jsb test
Merge pull request #400 from HoGarfield/Fix_onTouchBegan_return

Fix issue that error return from function onTouchBegan
Update cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js