Merge remote-tracking branch 'origin/CJL-NEW' into NewFilePath

wei

2020-12-11 37dc5f07121946aa03ce96030a9f400af032367d

 HDL_ON/Common/R.cs

@@ -4,6 +4,8 @@
{
    public static class StringId
    {
        public const int UnableToCreateScenarioPleaseBindGateway = 372;
        public const int FunctionCannotBeUsedPleaseBindGateway = 371;
        public const int TobeFamily = 370;
        public const int AddNewResidence = 369;
        public const int WelcomeToOnPlus = 368;