close #4400: Use the newest version of LuaSocket for lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
ignore [] in command [console run].
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr
closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode.
close #4452:Using better spelling format
close #4400: Update the anrroid.mk for lua-bindings
Merge pull request #5887 from andyque/fix_tests_warnings

Fix warnings in cpp-tests.
Merge pull request #5890 from dumganhar/iss4462-ccb

closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode...
Update CHANGELOG [ci skip]
Update Android.mk
Label:Refactoring related functions of color.
remove chipmunk int
update android utils
Merge pull request #5854 from boyu0/iss4424_setgravityenable_fix

closed #4424: fix PhysicsBody::setGravityEnable() doesn't work correctly sometimes
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.