Merge branch 'dev_cyp' into dev

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

Assets/Scripts/Scenes/LoginController.cs

@@ -300,7 +300,7 @@ public class LoginController : MonoBehaviour
                 UIManager.ShowConfirm("Quit", "Do you want to quit PowerFun?", () =>
                 {
                     Application.Quit();
-                });
+                },2);
             });
         }
 
@@ -341,7 +341,6 @@ public class LoginController : MonoBehaviour
                 //browser.
             }
         }
-
         wxLogin2 = mainContent.Find("FormContainer-wx2");
         if (wxLogin2 != null)
         {

Assets/Scripts/Scenes/MainController.cs

@@ -37,12 +37,12 @@ public class MainController : MonoBehaviour
         UIManager.Instance.Root = root;
         UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
         UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
-
-        if (App.CurrentUser == null)
+#if UNITY_EDITOR
+        if (App.CurrentUser == null) //App.CurrentUser == null
         {
             await Login();
         }
-
+#endif
         //MainMenu.transform.Find("Home").GetComponent<Button>().onClick.AddListener(() =>
         //{
         //    UIManager.ShowHomePanel();