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 #5907: Fix a issue in Particle Test
Issue #5907: Add retain/release functions for cc.Touch
Issue #5907: Refactor ccui's addEventListener functions to adapt to Html5 API
Issue #5907: Fix constant inconsistence in ccui.TextField
Issue #5907: Improve Facebook Tests
Update submodules
Update submodules
Merge pull request #766 from cocoscodeide/develop

runtime 1.4
Fixed #5909: Support formatted string in cc.log/cc.warn/cc.error/cc.assert
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #764 from pandamicro/develop

Issue #5907: Fix issues for 3.0 release
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update html5 engine
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