[Jenkins] watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins] watchdog
[Jenkins] watchdog
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
Update the reference of submodule "cocos2d-console".
Merge pull request #5728 from dumganhar/develop

[travis ci] Sort file list in generate-template-files.py.
Merge pull request #5727 from natural-law/develop

Update the reference of submodule "cocos2d-console".
[AUTO][ci skip]: updating cocos2dx_files.json
1.Label:Fixes the font rendering on Windows.
2.fixed Label::setColor crash when create the label by font name.
Merge pull request #5729 from CocosRobot/update_cocosfiles_1394627952

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5730 from Dhilan007/develop_label

Label:Fixes the font rendering on Windows and  possible crash when create the label by font name.
add description for how to load .so
Merge pull request #5735 from minggo/template-java-des

add description for how to load .so
EditBox:fixes clip the text width to fit to the text box on Android and IOS.
Simulator fix: After main loop, NSApplication  needs to be terminated immediately.
GLView::end needs to release self.
Merge pull request #5737 from dumganhar/runtime-fix

Lua Runtime fix