read to recv
support android 10
fix template confige mistake
modify filter folder
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
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #5 from cocos2d/master

update jsbranch
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
close #4285: Modify the mechanism of add.*EventListener bound to js for cocos2d ui
Update the `cocos2d-x` submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix
Feature #4010: Add retina display functions