fix the template
[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.
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
CCLOG -> CCLOGINFO for change of EditBox's position.
Merge pull request #5701 from lihex/develop

fix the template & update submodule
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.
watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
watchdog