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 into Iss4277_ReleaseV3.0
Merge pull request #72 from lihex/master

update submodule
Issue #4294: Merge constants and remove useless file ref in porj
Issue #4294: Add missed properties
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Updates .gitignore. Ignores 'templates/js-template-default/frameworks/js-bindings'
Fixing a bug that `filename_script` wasn't cleared in `ScriptingCore::cleanup`.
Updates jsb template.
Merge pull request #73 from dumganhar/master

BUG fixes for runtime.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Issue #4294: Fix bug of cc.SpriteFrame.create
Issue #4294: Fix bind of vertexZ
Merge pull request #74 from pandamicro/master

Issue #4294: Add missed properties
Merge pull request #75 from xingsenma/master

issue #4221 add rich text
Issue #4277: modifying some codes makes moonwarriors simulator to run