Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed CCBatchNode draw
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change interface
use 'with' instead of 'by'
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change interface from "by" to "with"
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
fixed lua compile
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

Conflicts:
	scripting/lua/cocos2dx_support/LuaCocoStudio.cpp
update submodule
fixed lua compile
update js binding for studio change.
remove unnecessary define
optimize button
Merge pull request #4805 from Dhilan007/master_222

update js binding for studio change.
Merge branch 'master' into master_nutty_modify_framework_optimizewidgets
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4819 from CocosRobot/updategeneratedsubmodule_1388720063

[AUTO] : updating submodule reference to latest autogenerated bindings
fix black screen in testlua
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x