Issue #5636: Remove some log
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
modify the IAP tests server address to localhost
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
fixed #5642 : rename siderbar to sideIndexBar to avoid name conflict in firefox
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update -x to fix AssetsManager win32 issue
Feature #5619: Refactor cc.pool from class to singleton object
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #534 from wuzhiming/master2

modify the IAP test server address to loaclhost
Merge pull request #535 from joshuastray/sidebar_fix

fixed #5642 : rename siderbar to sideIndexBar to avoid name conflict in firefox
Merge pull request #536 from pandamicro/master

Update -x to fix AssetsManager win32 issue
Release #5636: Use plugin.agentManager
Release #5636: Fix mistaken setContentSize usage, fall back to setSize
Release #5636: update cocos2dx_files.json
Release #5636: Fix UI test setContentSize bugs
add some tips for test-cases
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Release #5636: Fix UI test setContentSize bugs
Merge pull request #537 from pandamicro/master

Release #5636: Fix bugs