read to recv
support android 10
Issue #4277: add two test files to js-tests
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
fix template confige mistake
issue #4221 add rich text
issue #4221 delete un use resource
#4221 add richText
modify filter folder
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
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
merge jsMerge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
[AUTO] : updating jsbinding automatically
Merge pull request #70 from CocosRobot/update_js_bindings_1394187657

[AUTO] : updating jsbinding automatically
update h5 submodule
update submodule