Issue #5600: Fixed a bug about setContentSize
Merge pull request #539 from VisualSJ/master

Issue #5600: Fixed a bug about setContentSize
Issue #5600: Fixed a bug about setContentSize
Merge pull request #540 from VisualSJ/master

Issue #5600: Fixed a bug about setContentSize
Issue #5600: Syntax error
Merge branches 'master' and 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #541 from VisualSJ/master

Issue #5600: Syntax error
Release #5636: Temporary disable plugin-x test on web
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js