Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Team/TeamInviteBehaviour.cs

@@ -47,7 +47,7 @@
            m_Realm.gameObject.SetActive(invite.realm > 0);
            if (invite.realm > 0)
            {
                var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(invite.realm);
                var realmConfig = Config.Instance.Get<RealmConfig>(invite.realm);
                if (realmConfig != null)
                {
                    m_Realm.SetSprite(realmConfig.Img);