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
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed jsbinding compile
Merge commit 'refs/pull/4778/head' of git://github.com/cocos2d/cocos2d-x into merge4778

Conflicts:
	scripting/javascript/bindings/jsb_cocos2dx_studio_manual.cpp
Merge pull request #4858 from dumganhar/merge4778

Merge #4778