issue #5977: update testcase add , make the sidebar changeed when user click right and left in the test scene
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update jsb_ext_create_apis.js
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update jsb_ext_create_apis.js
Merge pull request #893 from sincntx/develop

new ccui.Button bug fix
Merge pull request #898 from dingpinglv/develop

Merge develop to master branch
Fixed #903: Made LabelTTF, LabelBMFont, LabelAtlas extendable in JSB
Fixed #904: Fixed TextField's wrapper issue in JSB
fix memory leak of cp.PolyShape
Merge pull request #1 from cocos2d/master

Master
fix the bug of cpGroup in segment query and nearest query
Merge pull request #910 from joshuastray/fix-query-on-mac-osx

Fix query on mac osx
Merge pull request #908 from joshuastray/develop

fix memory leak of cp.PolyShape
Merge pull request #905 from pandamicro/develop

Fix two bugs in JSB bindings
[AUTO] : updating jsbinding automatically
Merge pull request #1066 from CocosRobot/update_js_bindings_1414404451

[AUTO] : updating jsbinding automatically
Add outline shader example.
Merge pull request #1067 from IgorMats/develop

Add outline shader example.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop