fix file encoding
Merge branch 'master' of https://github.com/cocos2d/cocos2d-lua
add template cfg file & update submodule
Merge pull request #33 from samuele3hu/tip_generator

Update the submodule about cocos2d-x and update the project setting of testlua
remove mess code
Merge pull request #32 from lihex/master

add template cfg file & update submodule
Merge branch 'master' of https://github.com/cocos2d/cocos2d-lua into tip_generator