Add selected image to slider
Merge branch 'develop' into fix-extensions-slider
fix cc
Add scale ratio to button touchdown
Merge branch 'develop' into fix-button-scale-to
Merge branch 'develop' into fix-extensions-slider
issue #3401: physical lua banding script and auto script
Fixed mistake in documentation addImage doesn't support gif format
Fix for missing field in particle file.
fix error for load spriteFrames from plist in CCAnimationCache class.
remove should not have path.
issue #3401: physical lua banding script, add testlua->physics test
Remove useless samples
Fix:Resolve the release lua test sample compile error
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/CCLuaStack.cpp
	cocos/scripting/lua/script/Cocos2d.lua
	cocos/scripting/lua/script/Cocos2dConstants.lua
issue #3401: add physics lua auto generate to android.mk
Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample
Merge pull request #4939 from nutty898/develop_nutty_modify_framework_removeuselesssample

Develop nutty modify framework removeuselesssample
Merge pull request #4941 from samuele3hu/developNewUI

Fix:Resolve the release version of lua test sample compile error