Merge branch 'dev_cyp' into dev

# Conflicts:
#	Assets/Scripts/App.cs
#	Assets/Scripts/UIManager.cs

Assets/Scripts/Apis/Models/CountryInfo.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Scripts.Apis.Models
+{
+    public class CountryInfo
+    {
+        public string name { get; set; }
+        public List<ProvinceInfo> states;
+    }
+    public class CityInfo
+    {
+        public string name { get;set; }
+    }
+    public class ProvinceInfo
+    {
+        public string name { get; set; }
+        public List<CityInfo> cities;
+    }
+    public class ChinaCityObject 
+    {
+        public string name { get; set; }
+        public string province { get; set; }
+    }
+}

Assets/Scripts/Apis/Models/CountryInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a73f6936353246a4eaa680de61dd1fdf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: