Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop

Conflicts:
	cocos2dx/actions/CCActionManager.cpp
	cocos2dx/base_nodes/CCNode.cpp
	cocos2dx/base_nodes/CCNode.h
	cocos2dx/cocoa/CCObject.cpp
	extensions/network/HttpClient.cpp
	scripting/lua/cocos2dx_support/CCLuaEngine.h
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
	tools/tolua++/Cocos2d.pkg
	tools/tolua++/basic.lua