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
use lambda callback
Merge remote-tracking branch 'upstream/develop' into walk-node-tree
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
fix lambda introducer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luamerage
[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.
fixed incorrect initial value of label's TextVAlignment.
Merge pull request #13 from cocos2d/develop

update engine
Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
Adds lua-empty-test to VS project.
Merge pull request #5708 from Dhilan007/develop_label

fixed incorrect initial value of label's TextVAlignment.
Merge pull request #5709 from dumganhar/rename-tests

[win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test.