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

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageMgr.cs

@@ -293,8 +293,8 @@ namespace OTSModelSharp.Measure.GetStageInfo
                 foreach (var pStage in m_pStageFile.GetStagesList())
                 {
                     string sCurrentName = pStage.GetName();
-                    int findIndex = m_ctrlListBoxStageList.FindString(sCurrentName);
-                    if (findIndex < 0)
+                    //int findIndex = m_ctrlListBoxStageList.FindString(sCurrentName);
+                    if (!m_ctrlListBoxStageList.Items.Contains(sCurrentName))
                     {
                         m_ctrlListBoxStageList.Items.Add(sCurrentName);
                     }