Add event type to ListView
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
Fixed bug of guireader
Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5717 from CocosRobot/update_cocosfiles_1394620392

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5718 from samuele3hu/develop_new_fix

Replace the apis of LableTTF and LableBMFont with the apis of Label
[AUTO][ci skip]: updating cocos2dx_files.json
[AUTO]: updating luabinding automatically
Merge pull request #5720 from CocosRobot/update_lua_bindings_1394624410

[AUTO]: updating luabinding automatically
Merge pull request #5719 from CocosRobot/update_cocosfiles_1394624303

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5669 from nutty898/develop_nutty_modify_framework_for315CrashFixed

Develop nutty modify framework for315 crash fixed
Updates tools/travis-scripts/generate-template-files.py.
Merge pull request #5724 from dumganhar/develop

Updates tools/travis-scripts/generate-template-files.py.
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5725 from CocosRobot/update_cocosfiles_1394627042

[AUTO][ci skip]: updating cocos2dx_files.json
[travis ci] Sort file list in generate-template-files.py.
Update the reference of submodule "cocos2d-console".
Merge pull request #5728 from dumganhar/develop

[travis ci] Sort file list in generate-template-files.py.