Merge branch 'dev_cyp' into dev

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

Assets/Scripts/UI/Prefab/Panel/EditUserController.cs

@@ -256,9 +256,9 @@ public class EditUserController : PFUIPanel
     {
         UIManager.ShowConfirm("Logout", "Do you want to log out and change accounts?", () => 
         {
-            SceneManager.LoadScene("1-Login");
+            SceneManager.LoadScene("Login");
             UIManager.CloseConfirm();
-        });
+        },2);
     }
 
     // Update is called once per frame

Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs

@@ -32,9 +32,9 @@ public class UserInfoController : PFUIPanel
              {
                  UIManager.ShowConfirm("Logout", "Do you want to log out and change accounts?", () =>
                  {
-                     SceneManager.LoadScene("1-Login");
+                     SceneManager.LoadScene("Login");
                      UIManager.CloseConfirm();
-                 });
+                 },2);
              });
         infoPanel = transform.Find("InfoPanel").Find("P");