Merge remote-tracking branch 'origin/dev_mobile_ble' into dev_mobile

# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/Plugins/Android/AndroidManifest.xml.meta
#	Assets/Plugins/iOS.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/Devices/MainDeviceAdapter.cs
#	Assets/Scripts/Scenes/LoginController.cs
#	Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

Assets/Scripts/Scenes/LoginController.cs

@@ -330,6 +330,7 @@ public class LoginController : MonoBehaviour
              {
                  wxReturnLogin();
              });
+            #if !(UNITY_IOS || UNITY_ANDROID)
             wxBrowser = wxLogin1.Find("Browser (GUI)").GetComponent<Browser>();
             if (wxBrowser != null)
             {
@@ -941,7 +942,9 @@ public class LoginController : MonoBehaviour
     void wxReturnLogin() 
     {
         wxLock = true;
+#if !(UNITY_IOS || UNITY_ANDROID)
         wxBrowser.LoadHTML("<div/>");
+#endif
         //wxBrowser.Url = "chrome://version/";
         wxLogin1.DOLocalMoveY(-573, 0.3f).onComplete = () =>
         {

Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs

@@ -56,7 +56,7 @@ namespace Assets.Scenes.Ride.Scripts
 				weight = App.CurrentUser.Weight;
 				bicycleWeight = App.CurrentUser.BicycleWeight;
 //#if UNITY_EDITOR
-                power = 500;
+                //power = 500;
 //#endif
                 mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100);
 			}