Merge branch 'CJL' into NewFilePath

wxr

2020-12-16 5c5461b7c46aff66d24efe80062c235342e77d4c

 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;