更新
Merge branch 'master' of https://github.com/ffcspub/xsgj

Conflicts:
	xsgj/KHGLAPI.h
	xsgj/KHGLAPI.m
	xsgj/KHGLHttpRequest.h
	xsgj/KHGLHttpRequest.m
	xsgj/KHGLHttpResponse.h
	xsgj/KHGLHttpResponse.m
	xsgj/xsgj.xcworkspace/xcuserdata/wholeit.xcuserdatad/UserInterfaceState.xcuserstate