Release #5636: Update engine version
Release #5636: Update authors
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Release #5636: Update html5 engine
Merge branches 'master' and 'master' of https://github.com/cocos2d/cocos2d-js
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