commit outSingle
Merge branch 'working' into develop

Conflicts:
	XinYuanERP/Common/URLConstant.h