fix the template
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/build-cfg.json
Merge pull request #5701 from lihex/develop

fix the template & update submodule