Issue #5335: Fix js-moonwarriors compilation issue
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #434 from pandamicro/master

Sync Cocos2d-x Fix js-moonwarriors compilation issue