Update CHANGELOG [ci skip]
fix typo and mistake in Label::setTextColor.
Merge pull request #5882 from natural-law/develop

Backup the environment  file when adding environment variable in setup.py.
update license.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
add licenses for AA-EDT
Merge pull request #5889 from samuele3hu/develop_socket

close #4400: Use the latest version of LuaSocket and modify the related project config
Update CHANGELOG [ci skip]
[AUTO][ci skip]: updating cocos2dx_files.json
Autorelease custom extended class, fix memory leak
Merge pull request #5897 from Dhilan007/develop_edtaa_license

update license.
Merge pull request #5899 from CocosRobot/update_cocosfiles_1395370450

[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #5900 from heliclei/fix-test-memory-leak

 fix memory leak in CocosDenshionTest.
Update CHANGELOG [ci skip]
[AUTO][ci skip]: updating cocos2dx_files.json
close #4452:Make `addCustomHandler` more distinct
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
Merge pull request #5902 from CocosRobot/update_cocosfiles_1395372145

[AUTO][ci skip]: updating cocos2dx_files.json
update pc show msg
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
Thank @pandamicro.