Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge pull request #9 from cocos2d/master

update template
Merge pull request #10 from cocos2d/master

update js
Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
update win32 template
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
add libgui
Merge pull request #142 from dumganhar/master

Update cocos2d-x.
Refactor #4365: Fix bugs and update cocos2d-html5
space
Issue #4294: Bind cc.view.resizeWithBrowserSize, cc.view.setResizeCallback
Merge pull request #143 from pandamicro/master

Refactor #4365: Fix bugs and update cocos2d-html5
update submodule
Merge pull request #145 from lihex/master

update submodule
Merge pull request #144 from chuanweizhang2013/master

win32 template update
Issue #4294: Fix LabelAtlas create issue
Merge pull request #146 from pandamicro/master

Issue #4294: Fix LabelAtlas create issue