add
Solve the crash in CocoStudioComponentsTest.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #5577 from chuanweizhang2013/update-cocosfile

update coocs2dx_files.json
[travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change.
Merge pull request #5579 from dumganhar/develop

[travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change.
rename template config file
Merge pull request #5580 from lihex/develop

rename template config file
Uncomments '.generate-cocosfiles.sh'.
Merge pull request #5581 from dumganhar/develop

[travis ci] Uncomments '.generate-cocosfiles.sh'.
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
Merge pull request #5582 from CocosRobot/update_cocosfiles_1394086147

[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
[travis ci] Updates generate-cocosfiles.sh.
Merge pull request #5583 from dumganhar/develop

[travis ci] Updates generate-cocosfiles.sh.
update readme and release note
Merge pull request #5585 from minggo/develop

update readme and release note
Uses 'generate-tempate-files.py' to generate cocos2dx_files.json
Merge pull request #5586 from dumganhar/develop

Uses 'generate-tempate-files.py' to generate cocos2dx_files.json
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5587 from CocosRobot/update_cocosfiles_1394089188

[AUTO][ci skip]: updating cocos2dx_files.json