Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update html5 engine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5907: Fix issues of ccui's addEventListenerXXX in Tests
Merge pull request #769 from pandamicro/develop

Issue #5907: Fix issues of ccui's addEventListenerXXX in Tests