Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
modify generate-template-files