Merge remote-tracking branch 'origin/1.1' into linux-editor

# Conflicts:
#	Source/FlaxEngine.Gen.cs
#	Source/Tools/Flax.Build/Utilities/Utilities.cs

Source/Engine/Platform/Base/PlatformBase.cpp

@@ -19,6 +19,7 @@
 #include "Engine/Engine/CommandLine.h"
 #include "Engine/Engine/Engine.h"
 #include "Engine/Utilities/StringConverter.h"
+#include "Engine/Platform/BatteryInfo.h"
 #include <iostream>
 
 // Check types sizes
@@ -381,6 +382,11 @@ void PlatformBase::SetHighDpiAwarenessEnabled(bool enable)
 {
 }
 
+BatteryInfo PlatformBase::GetBatteryInfo()
+{
+    return BatteryInfo();
+}
+
 int32 PlatformBase::GetDpi()
 {
     return 96;