Release #5636: Update engine version
Release #5636: Update authors
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Release #5636: Update html5 engine
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
Release #5636: Fix moon warriors touch event issue
Merge pull request #542 from pandamicro/master

Prepare for release
Merge pull request #55 from chuanweizhang2013/master

copy res when update resource
Merge pull request #543 from cocoscodeide/master

copy res when update resource
Update the reference of submodule cocos2d-console.
Merge pull request #544 from natural-law/master

Update the reference of submodule cocos2d-console.
issue #5222: fix 4*4 mat to 2*3 mat converting bug