Merge pull request #833 from pandamicro/develop

Update plugin-x
Feature #5971 : [JSB] Bind ccs timeline reader
Bug #5975 : fix indentation in jsb scripts
Merge pull request #837 from joshuastray/develop

Bug #5975 : fix indentation in jsb scripts
Merge pull request #836 from joshuastray/timeline-reader

Feature #5971 : [JSB] Bind ccs timeline reader
[AUTO] : updating jsbinding automatically
Issue #5976 : fix typo in chipmunk : JSB_cpBase_object => JSB_cpSpace_object
Merge pull request #838 from CocosRobot/update_js_bindings_1413271322

[AUTO] : updating jsbinding automatically
Merge pull request #839 from joshuastray/develop

Issue #5976 : fix typo in chipmunk : JSB_cpBase_object => JSB_cpSpace_object
Update the reference of submodule cocos2d-console.
Merge pull request #840 from natural-law/develop

Update the reference of submodule cocos2d-console.
update testcase
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Fixed #5978: Rename cc.Node#setRotationSkewX/Y to cc.Node#setRotationX/Y
Merge pull request #841 from jianglong0156/develop

Fixed #5977: update testcase
ignore *.txt.user generated by some IDE
don't use * for CMakeLists.txt.user
issue #5977: fix some menu click effect wrong
issue #5849 : Return listener's reference for cc.eventManager.addListener
Merge pull request #842 from joshuastray/develop

ignore CMakeLists.txt.user generated by some IDE