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
space
Merge pull request #144 from chuanweizhang2013/master

win32 template update