Merge branch 'dev_lishuo' into dev_cyp

# Conflicts:
#	Assets/Resources/UI/Prefab/Panel/Mobile/DevicePanel.prefab
#	Assets/Scenes/Login-Mobile.unity
#	Assets/Scenes/Login.unity
#	Assets/Scripts/App.cs
#	Assets/Scripts/Editor.meta
#	Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs

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

@@ -175,7 +175,7 @@ public class EditUserController : PFUIPanel, INativeOnMobileImageSelect
         mSexDropdown.ClearOptions();
         mSexDropdown.AddOptions(new List<string>
         {
-            "Male","Female"
+            App.GetLocalString("Male"),App.GetLocalString("Female")
         });
         mUnitDropdown.ClearOptions();
         mUnitDropdown.AddOptions(UIManager.Instance.loginRegOptions.units);

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

@@ -226,7 +226,9 @@ public class MapListController : PFUIPanel
             drop.value = 0;
             drop.onValueChanged.AddListener((int index)=> 
             {
-                sort = drop.options[index].text;
+                var text = drop.options[index].text;
+
+                sort = MapFilterOptions.sortsDict[text];
                 if (sort == "Trend") 
                 {
                     sort = "Hot";