Update the submodule about `cocos2d-x`
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
add igonroe files
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Issue #4294: Fix bugs in Cocostudio Component test
	Add ComponentContainer class binding
Issue #4294: Fix bugs in Cocostudio Armature test
	Add DecorativeDisplay class binding, bind cc.Bone::getColliderBodyList
close #4284:Update the ‘cocos2d-x’ submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Issue #4294: Move cc.defineGetterSetter in jsb_cocos2d.js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Issue #4294: Reverse move cc.defineGetterSetter in jsb_cocos2d.js
update auto-bindings manually
Merge pull request #61 from dumganhar/master

Updates template. Zoom in/out works ok, Set window size also works.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Issue #4294: Add eventManager.dispatchCustomEvent
Merge pull request #60 from pandamicro/master

Issue #4294: Fix bugs in Cocostudio tests
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix