Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
issue #5253: move cc.loader.resPath to ctor & onExit
Merge pull request #414 from joshuastray/master

issue #5253: move cc.loader.resPath to ctor & onExit
Merge pull request #25 from chuanweizhang2013/master

update cocos2d-js template
issue #5335: update cocos2d-js logo and v3.0 beta link.
issue #5335: updated cocos2d-js documentation url
issue #5335: Updated change log for cocos2d-js v3.0 beta
Merge pull request #416 from linshun/master

issue #5335: Updated change log for cocos2d-js v3.0 beta, and updated cocos2d-js logo
[v3.0 beta release] Update submodules
fixed #5351:projects support Visual Studio 2013
Update cocos2d-x
Feature #5253: Fix a bug in JSB AssetsManagerTest
Feature #5335: Fix a bug of LabelBMFont usage
Update Cocos2d-x
issue #5027: add back menu for plugin-x test
Feature #5253: Make JSB AssetsManager test use writablepath
Feature #5253: Fix an path issue in AssetsManagerTest
Merge pull request #418 from pandamicro/master

[v3.0 beta release] Update submodules
Merge pull request #422 from joshuastray/master

issue #5351:projects support Visual Studio 2013