update submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
fix the template
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
update submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
update submodule
Merge pull request #175 from lihex/master

template fix