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
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
Merge pull request #73 from dumganhar/master

BUG fixes for runtime.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
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
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Merge pull request #76 from dingpinglv/Iss4277_ReleaseV3.0

Issue #4277: modifying some codes makes moonwarriors simulator to run
[template update] Adds project.json to Mac project.