Issue #4277 : Fix bugs about js-moonwarriors.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #62 from SmallAiTT/master

Issue #4277 : Fix bugs about js-moonwarriors.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into bug_fix