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
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Issue #4294: Fix bug of cc.Label.create with TEXT_ALIGNMENT_LEFT
Issue #4294: Remove duplicated constants
Issue #4294: cc.LabelBMFont: function name bind in JS level
Issue #4294: Fix menu test error: event listener released by spider monkey
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #63 from samuele3hu/bug_fix

Update config files for bindings-generator
[AUTO] : updating jsbinding automatically
Merge pull request #65 from CocosRobot/update_js_bindings_1394182322

[AUTO] : updating jsbinding automatically
Issue #4294: Fix menu test error with another implementation
Issue #4294: Remove Node Camera test and OpenGL test for JSB, bind GLProgram::addAttribute