fix ease elastic action error
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
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
Merge branch 'develop' of https://github.com/chuanweizhang2013/cocos2d-x into develop
Fixed bug of guireader
add runtime template
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
[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
use lambda callback
CCLOG -> CCLOGINFO for change of EditBox's position.