Merge branch 'WJC' into temp-wxr

wxr

2021-03-23 09bde2ffef953fa5e78a4320aa8bbe03276ed7c5

 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;
                }