uu
aa
Merge branch 'master' of https://github.com/cxuhua/cxEngine

Conflicts:
	actions/cxParabola.h
	core/cxEngine.c
	core/cxString.h
	cxEngine.xcodeproj/project.xcworkspace/xcuserdata/xuhua.xcuserdatad/UserInterfaceState.xcuserstate
	cxEngine/res/action.xml
	cxEngine/res/particle.pex
	cxEngine/res/particle.xml
	cxEngineIOS.xcodeproj/project.pbxproj