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 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