Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 a6bad443ca7e9d01ebf22e1a0b2452b9e25120e7

 HDL_ON/Common/R.cs

@@ -4,6 +4,7 @@
{
    public static class StringId
    {
        public const int GatewayOfflineCannotCreateScene = 375;
        public const int ResidenceDeletedSwitchToAnotherResidence = 374;
        public const int AddFloorFail = 373;
        public const int UnableToCreateScenarioPleaseBindGateway = 372;