Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime

Conflicts:
	templates/lua-template-runtime/cocos-project-template.json
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime