fix ease elastic action error
Add event type to ListView
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
add EnumChildNodesByName, walk node tree with callback
correct naming convetion
Fixed bug of guireader
add runtime template
Update CHANGELOG [ci skip]
fix the template
Merge pull request #5635 from andyque/fix_ease_action

fix wrong display of ease elastic action test.
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5699 from CocosRobot/update_cocosfiles_1394597345

[AUTO][ci skip]: updating cocos2dx_files.json
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
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