Merge remote-tracking branch 'origin/dev_combine' into dev_release

# Conflicts:
#	Assets/Scripts/App.cs

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

@@ -42,11 +42,8 @@ public class HomeController : PFUIPanel
 
 #if UNITY_ANDROID || UNITY_IOS
         var nav = transform.Find("MainNav-mobile").GetComponent<NewMainNav>();
-        nav.SetButtonActive(new List<int> { 1, 3, 4, 6 },null,new NewMainNav.CustomButton(Resources.Load<Sprite>("Images/RowerNew/ICON_mode_44"), () => 
-        {
-            UIManager.ShowRowerSelector();
-        },false));
         nav.HideButton("Custom");
+        nav.SetButtonActive(new List<int> { 2, 3, 6, 7 });
         newNav = nav;
         UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b =>
         {