Merge branch 'WJC' into temp-wxr

wxr

2021-03-24 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c

 HDL_ON/Common/FileUtlis.cs

@@ -48,7 +48,7 @@
        {
            get
            {
                if(DB_ResidenceData.Instance.CurrentRegion == null)
                if(DB_ResidenceData.Instance.CurrentRegion == null || DB_ResidenceData.Instance.CurrentRegion.RegionID == null)
                {
                    return AccountPath;
                }