Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -1672,7 +1672,6 @@
     <EmbeddedResource Include="Help.resx">
       <DependentUpon>Help.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

OTSPartA_STDEditor/UI/STDRuleslist.cs

@@ -595,6 +595,11 @@ namespace OTSPartA_STDEditor
                     e.CancelEdit=true;
                     return;
                 }
+                if (e.Label == "Default")
+                {
+                    e.CancelEdit = true;
+                    return;
+                }
                 if (e.Label != null && e.Label != "")
                 {
                     if (m_MainForm._sTDEditor.GroupIdDictionaryFromName.ContainsKey(e.Label))