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
use lambda callback
CCLOG -> CCLOGINFO for change of EditBox's position.
Merge pull request #5701 from lihex/develop

fix the template & update submodule
Merge remote-tracking branch 'upstream/develop' into walk-node-tree
Merge pull request #5700 from dumganhar/develop

Some fixes: [lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.
Some warning fixes in TriggerMng.cpp and TriggerObj.cpp
Comment some lines in CCEditBoxImplIOS.mm/CCEditBoxImplAndroid.cpp, since after re-implement LabelTTF by Label, '(g|s)etTextureRect' will not work, it's because LabelTTF is inherited from Node rather than Sprite now. We need to fix this as soon as possible.
Replace cc.LabelTTF:create with cc.Label:create
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix

Conflicts:
	tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
Changes the order of inheritance for GLView. Reason:
```
 	bool ok = true;
 	JSObject *obj = JS_THIS_OBJECT(cx, vp);
 	js_proxy_t *proxy = jsb_get_js_proxy(obj);
	cocos2d::GLViewProtocol* cobj = (cocos2d::GLViewProtocol *)(proxy ? proxy->ptr : NULL);   // This line will cause the 'cobj' to be an invalid object, since the instance is a 'GLView', but we force cast it to 'GLViewProtocol*'.
 	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLViewProtocol_setDesignResolutionSize : Invalid Native Object");
 	if (argc == 3) {
 		double arg0;

```
After changing the order, the result could be fixed. But I don't know whether it's the best way to fix it. Anyway, it wouldn't break anything right now.
label:
1.fixed crash if create label by font name and text is empty.
2.fixed getter of font name and font size is incorrect.
fix lambda introducer
using string::empty() for judge whether string is empty.
Merge pull request #5703 from Dhilan007/develop_label

label:fixed crash and incorrect getter.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage
label:change default font size
rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects.
Merge pull request #5704 from Dhilan007/develop_label

label: Change default font size from `32` to `12`, it's compatible with old LabelTTF.
Merge pull request #5702 from dumganhar/glview-inherit-order

Changes the order of inheritance for GLView. Reason:
[Jenkins] watchdog
[AUTO]: updating luabinding automatically