Merge pull request #53 from cocos2d/master

update template js
Merge pull request #31 from cocoscodeide/master

update runtime js
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Release #5636: Update engine version
Merge pull request #54 from cocos2d/master

update js
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
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