Merge branch 'cxs' of http://36.129.163.148:30080/gogsadmin/OTS into cxs

 Conflicts:
	OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/Control_XRayTable.cs
	OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.Designer.cs