add igonroe files
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Issue #4277: add two test files to js-tests
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
issue #4221 add rich text
issue #4221 delete un use resource
#4221 add richText
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Issue #4277 : Make CCBoot to support singlefile mode.
[AUTO] : updating jsbinding automatically
update submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Issue #4294 : Change the way to load project.json.
update submodule
Merge branch 'master' of https://github.com/lihex/cocos2d-js
Merge pull request #69 from lihex/master

udpate submodule & template
Merge pull request #67 from CocosRobot/update_js_bindings_1394185107

[AUTO] : updating jsbinding automatically
Merge pull request #68 from SmallAiTT/master

Issue #4294 : Change the way to load project.json.
[AUTO] : updating jsbinding automatically