Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DC_7C

# Conflicts:
#	INT69DC_7C/Forms/FormUserEditor.designer.cs

INT69DC_7C/Forms/FormUserEditor.cs

@@ -388,11 +388,9 @@ namespace INT69DC_7C.Forms
                     this.labelSystem.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuSystem);
                     this.labelMotor.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuMotor);
                     this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuIOTest);
-                    this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuEquipment);
                     this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuUpdate);
                     this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuInitialization);
                     this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuTime);
-                    this.labelUser.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuUser);
                     this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuDataBackup);
                     this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuStatistics);
                     this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level1.IsMenuViewer);
@@ -410,11 +408,9 @@ namespace INT69DC_7C.Forms
                     this.labelSystem.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuSystem);
                     this.labelMotor.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuMotor);
                     this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuIOTest);
-                    this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuEquipment);
                     this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuUpdate);
                     this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuInitialization);
                     this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuTime);
-                    this.labelUser.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuUser);
                     this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuDataBackup);
                     this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuStatistics);
                     this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level2.IsMenuViewer);
@@ -432,11 +428,9 @@ namespace INT69DC_7C.Forms
                     this.labelSystem.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuSystem);
                     this.labelMotor.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuMotor);
                     this.labelIOTest.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuIOTest);
-                    this.labelEquipment.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuEquipment);
                     this.labelUpdate.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuUpdate);
                     this.labelInitialization.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuInitialization);
                     this.labelTime.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuTime);
-                    this.labelUser.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuUser);
                     this.labelDataBackup.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuDataBackup);
                     this.labelStatistics.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuStatistics);
                     this.labelViewer.ForeColor = this.ReturnColor(this.ParentForm.CurrentUserGroup.Level3.IsMenuViewer);
@@ -455,11 +449,9 @@ namespace INT69DC_7C.Forms
                     this.labelSystem.ForeColor = Color.Black;
                     this.labelMotor.ForeColor = Color.Black;
                     this.labelIOTest.ForeColor = Color.Black;
-                    this.labelEquipment.ForeColor = Color.Black;
                     this.labelUpdate.ForeColor = Color.Black;
                     this.labelInitialization.ForeColor = Color.Black;
                     this.labelTime.ForeColor = Color.Black;
-                    this.labelUser.ForeColor = Color.Black;
                     this.labelDataBackup.ForeColor = Color.Black;
                     this.labelStatistics.ForeColor = Color.Black;
                     this.labelViewer.ForeColor = Color.Black;
@@ -653,11 +645,9 @@ namespace INT69DC_7C.Forms
             this.labelSystem.ForeColor = this.ReturnColor(item.IsMenuSystem);
             this.labelMotor.ForeColor = this.ReturnColor(item.IsMenuMotor);
             this.labelIOTest.ForeColor = this.ReturnColor(item.IsMenuIOTest);
-            this.labelEquipment.ForeColor = this.ReturnColor(item.IsMenuEquipment);
             this.labelUpdate.ForeColor = this.ReturnColor(item.IsMenuUpdate);
             this.labelInitialization.ForeColor = this.ReturnColor(item.IsMenuInitialization);
             this.labelTime.ForeColor = this.ReturnColor(item.IsMenuTime);
-            this.labelUser.ForeColor = this.ReturnColor(item.IsMenuUser);
             this.labelDataBackup.ForeColor = this.ReturnColor(item.IsMenuDataBackup);
             this.labelStatistics.ForeColor = this.ReturnColor(item.IsMenuStatistics);
             this.labelViewer.ForeColor = this.ReturnColor(item.IsMenuViewer);