Merge branch 'WJC' into temp-wxr

wxr

2021-03-31 3532db3610381f37eca1a6ac783d882517847c91

 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs

@@ -495,7 +495,7 @@
                    case ShowFunction.Panel:
                        break;
                    case ShowFunction.SecurityMonitoring:
                        functionCount = 1;
                        //functionCount = 1;
                        break;
                    case ShowFunction.Sensor:
                        functionCount = FunctionList.List.GetArmSensorList().Count;