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 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
Merge pull request #769 from pandamicro/develop

Issue #5907: Fix issues of ccui's addEventListenerXXX in Tests
update prebuilt runtime IPA for device
Merge pull request #83 from honghui/develop

update prebuilt runtime IPA for device
Merge pull request #770 from cocoscodeide/develop

update prebuilt runtime IPA for device
Update html5 engine
Update engine version
Update submodules
add stringify to FacebookUserTest.js logout result
Merge pull request #772 from wuzhiming/fb_3rd

add stringify to FacebookUserTest.js logout result
Update -x repo
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #771 from pandamicro/develop

Update submodules
Update html5 engine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop