Updates cocos2d-x
Updates template. Zoom in/out works ok, Set window size also works.
Merge pull request #61 from dumganhar/master

Updates template. Zoom in/out works ok, Set window size also works.
Merge pull request #60 from pandamicro/master

Issue #4294: Fix bugs in Cocostudio tests
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
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.
Issue #4294: Fix bug of cc.Label.create with TEXT_ALIGNMENT_LEFT
Issue #4294: Remove duplicated constants
Issue #4294: cc.LabelBMFont: function name bind in JS level
Issue #4294: Fix menu test error: event listener released by spider monkey
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js