Merge pull request #117 from lihex/master

update submodule & fix template
update submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js