close #4400: Use the newest version of LuaSocket for lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
close #4400: Update the anrroid.mk for lua-bindings
update license.
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]
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ConstructorAccss