Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
issue #5915: remove useless resource in proj.win32/game.rc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #767 from joshuastray/develop

issue #5915: remove useless resource in proj.win32/game.rc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5907: Fix issues of ccui's addEventListenerXXX in Tests