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

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -285,7 +285,7 @@ namespace OTSMeasureApp
                     sp.ShowDialog();
                 }
             }
-            catch
+            catch (ThreadAbortException)
             {
 
             }