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

Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp