diff --git a/CSM/ConanServerManager_1.1.38.exe b/CSM/ConanServerManager_1.1.38.exe
new file mode 100644
index 00000000..b28e65ee
Binary files /dev/null and b/CSM/ConanServerManager_1.1.38.exe differ
diff --git a/CSM/ConanServerManager_1.1.38.zip b/CSM/ConanServerManager_1.1.38.zip
new file mode 100644
index 00000000..388d58fb
Binary files /dev/null and b/CSM/ConanServerManager_1.1.38.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index 8dd9a0c8..ff5ad18f 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,49 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager release version feed.</subtitle>
   <link href="http://servermanagers.freeforums.net/" />
-  <updated>2020-06-11T12:00:00Z</updated>
+  <updated>2020-07-11T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:C8612D41-184B-4A9E-9780-457B0337CD33</id>
+    <title>1.1.38 (1.1.38.13)</title>
+    <summary>1.1.38.13</summary>
+    <link href="" />
+    <updated>2020-07-11T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">BUGFIX</u>
+          <br/>
+          <ul>
+            <li>Added Whitelist checkbox to the sync.</li>
+          </ul>
+          <u style="font-size: .9em;">NEW</u>
+          <br/>
+          <ul>
+            <li>Global Settings - Shutdown Options - Have added a new setting to disable the online player check when shutting down the server.</li>
+            <li>Shutdown Window - Have added a new setting to disable the online player check when shutting down the server.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Globalisation - added some additional strings to the globalisation files.</li>
+            <li>Remove the avatar images from the player/rcon list.</li>
+            <li>Removed the map from the profile sync.</li>
+            <li>Removed all steam related features from PlayerList/Rcon windows.</li>
+            <li>Fixed loaded EPIC player profiles in PlayerList/Rcon windows.</li>
+            <li>Removed steam details from Player window.</li>
+            <li>Changed the Server Files section to be generic.</li>
+            <li>Changed the database schema, so the player and tribe loading works again.</li>
+            <li>Updated QueryMaster to handle missing message parts, when querying the server.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:3BF2385D-97ED-48C9-890E-E76F740B4EBB</id>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index 6f89d5c1..a35a678b 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -120,10 +120,10 @@
     <!--#endregion-->
 
     <!--#region AddSteamUserWindow Window -->
-    <sys:String x:Key="AddSteamUser_Title">Add Steam Users</sys:String>
-    <sys:String x:Key="AddSteamUser_InstructionLabel">Enter one or more SteamIds. Each id must be on a new line.</sys:String>
-    <sys:String x:Key="AddSteamUser_ProcessButtonLabel">OK</sys:String>
-    <sys:String x:Key="AddSteamUser_CancelButtonLabel">Cancel</sys:String>
+    <sys:String x:Key="AddUser_Title">Add Users</sys:String>
+    <sys:String x:Key="AddUser_InstructionLabel">Enter one or more ids. Each id must be on a new line.</sys:String>
+    <sys:String x:Key="AddUser_ProcessButtonLabel">OK</sys:String>
+    <sys:String x:Key="AddUser_CancelButtonLabel">Cancel</sys:String>
     <!--#endregion-->
 
     <!--#region ProcessorAffinity Window -->
@@ -368,6 +368,8 @@
     <sys:String x:Key="ShutdownWindow_RestartServerTooltip">If enabled, the server will be immediately restarted after it is shutdown.</sys:String>
     <sys:String x:Key="ShutdownWindow_UpdateServerLabel">Update server after shutdown</sys:String>
     <sys:String x:Key="ShutdownWindow_UpdateServerTooltip">If enabled, the server will be updated after it is shutdown.</sys:String>
+    <sys:String x:Key="ShutdownWindow_CheckForOnlinePlayersLabel">Perform Online Player Check</sys:String>
+    <sys:String x:Key="ShutdownWindow_CheckForOnlinePlayersTooltip">If enabled, the shutdown process will check if players are online. If no player are online, the grace period will be bypassed and shutdown will happen immediately. Otherwise the shutdown will wait until the grace period timer runs out.</sys:String>
     <sys:String x:Key="ShutdownWindow_SendShutdownMessagesLabel">Send Shutdown Messages to Game Client</sys:String>
     <sys:String x:Key="ShutdownWindow_SendShutdownMessagesTooltip">If enabled, the shutdown messages will be sent to the game client via RCON. NOTE: RCON must be enable on the server.</sys:String>
     <sys:String x:Key="ShutdownWindow_BackupWorldFileLabel">Backup world file after shutdown</sys:String>
@@ -417,7 +419,7 @@
     <sys:String x:Key="RCON_Menu_ViewSteamProfile">View Steam Profile...</sys:String>
     <sys:String x:Key="RCON_Menu_ViewProfile">View Profile...</sys:String>
     <sys:String x:Key="RCON_Menu_ViewTribe">View Clan...</sys:String>
-    <sys:String x:Key="RCON_Menu_CopySteamId">Copy Steam ID...</sys:String>
+    <sys:String x:Key="RCON_Menu_CopyId">Copy ID...</sys:String>
     <sys:String x:Key="RCON_Menu_CopyPlayerId">Copy Player ID...</sys:String>
 
     <sys:String x:Key="RCON_StatusLabel">Status:</sys:String>
@@ -443,8 +445,8 @@
     <sys:String x:Key="RCON_ChatPlayerLabel">Send a chat message to :</sys:String>
     <sys:String x:Key="RCON_RenamePlayerLabel">Rename player from :</sys:String>
     <sys:String x:Key="RCON_RenameTribeLabel">Rename clan from :</sys:String>
-    <sys:String x:Key="RCON_CopySteamIdLabel">Steam ID copied to the clipboard for :</sys:String>
-    <sys:String x:Key="RCON_CopySteamIdTitle">Steam ID copied</sys:String>
+    <sys:String x:Key="RCON_CopyIdLabel">ID copied to the clipboard for :</sys:String>
+    <sys:String x:Key="RCON_CopyIdTitle">ID copied</sys:String>
     <sys:String x:Key="RCON_CopyPlayerIdLabel">Player ID copied to the clipboard for :</sys:String>
     <sys:String x:Key="RCON_CopyPlayerIdTitle">Player ID copied</sys:String>
     <sys:String x:Key="RCON_ClipboardErrorLabel">Clipboard could not be opened. Another application may be using it. Please try closing other applications and trying again.</sys:String>
@@ -483,10 +485,9 @@
     <sys:String x:Key="PlayerList_ProfileCountLabel">Profiles:</sys:String>
     <sys:String x:Key="PlayerList_ProfileInvalidCountLabel">Invalid:</sys:String>
 
-    <sys:String x:Key="PlayerList_Menu_ViewSteamProfile">View Steam Profile...</sys:String>
     <sys:String x:Key="PlayerList_Menu_ViewProfile">View Profile...</sys:String>
     <sys:String x:Key="PlayerList_Menu_ViewTribe">View Clan...</sys:String>
-    <sys:String x:Key="PlayerList_Menu_CopySteamId">Copy Steam ID...</sys:String>
+    <sys:String x:Key="PlayerList_Menu_CopyId">Copy ID...</sys:String>
     <sys:String x:Key="PlayerList_Menu_CopyPlayerId">Copy Player ID...</sys:String>
 
     <sys:String x:Key="PlayerList_Menu_Players">_Players</sys:String>
@@ -497,14 +498,11 @@
     <sys:String x:Key="PlayerList_Menu_Filter">_Filter</sys:String>
     <sys:String x:Key="PlayerList_Menu_FilterOffline">Show All</sys:String>
     <sys:String x:Key="PlayerList_Menu_FilterAdmin">Show Admin</sys:String>
-    <sys:String x:Key="PlayerList_Menu_FilterBanned">Show Banned</sys:String>
     <sys:String x:Key="PlayerList_Menu_FilterWhitelisted">Show Whitelisted</sys:String>
     <sys:String x:Key="PlayerList_Menu_FilterInvalid">Show Invalid</sys:String>
-    <sys:String x:Key="PlayerList_Menu_ShowAvatars">Show Player Avatars</sys:String>
     <!--#endregion-->
 
     <!--#region Player/Tribe Profile Window -->
-    <sys:String x:Key="Profile_SteamSectionLabel">Steam Details</sys:String>
     <sys:String x:Key="Profile_PlayerSectionLabel">Player Details</sys:String>
     <sys:String x:Key="Profile_TribeSectionLabel">Clan Details</sys:String>
     <sys:String x:Key="Profile_TribeMembersSectionLabel">Clan Members</sys:String>
@@ -513,20 +511,13 @@
     <sys:String x:Key="Profile_NameLabel">Name:</sys:String>
     <sys:String x:Key="Profile_OnlineLabel">Online:</sys:String>
     <sys:String x:Key="Profile_LastOnlineLabel">Last Online:</sys:String>
-    <sys:String x:Key="Profile_BannedCommunityLabel">Community Banned:</sys:String>
-    <sys:String x:Key="Profile_BannedVACLabel">VAC Banned:</sys:String>
-    <sys:String x:Key="Profile_BannedVACCountLabel">Number of VAC Bans:</sys:String>
-    <sys:String x:Key="Profile_BannedVACDaysLabel">Days Since Last Ban:</sys:String>
     <sys:String x:Key="Profile_LevelLabel">Level:</sys:String>
-    <sys:String x:Key="Profile_BannedLabel">Banned:</sys:String>
-    <sys:String x:Key="Profile_BannedGameCountLabel">Number of Game Bans:</sys:String>
     <sys:String x:Key="Profile_TribeOwnerLabel">Owner:</sys:String>
-    <sys:String x:Key="Profile_SteamNameColumnLabel">Steam Name</sys:String>
+    <sys:String x:Key="Profile_PlatformNameColumnLabel">Player Name</sys:String>
     <sys:String x:Key="Profile_CharacterNameColumnLabel">Character Name</sys:String>
     <sys:String x:Key="Profile_LevelColumnLabel">Level</sys:String>
     <sys:String x:Key="Profile_OnlineColumnLabel">Online</sys:String>
     <sys:String x:Key="Profile_LastOnlineColumnLabel">Last Online</sys:String>
-    <sys:String x:Key="Profile_NavigateSteamProfile">Click to open the steam profile in a browser</sys:String>
 
     <sys:String x:Key="Profile_WindowTitle_Player">Player Profile - {0}</sys:String>
     <sys:String x:Key="Profile_WindowTitle_Tribe">Clan Profile - {0}</sys:String>
@@ -713,6 +704,8 @@
 
     <sys:String x:Key="GlobalSettings_ShutdownLabel">Shutdown Options</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownMessageInformationLabel">These warning messages will only be broadcast to your server if RCON is enabled and the RCON port set on your server profile.</sys:String>
+    <sys:String x:Key="GlobalSettings_CheckForOnlinePlayersLabel">Perform Online Player Check</sys:String>
+    <sys:String x:Key="GlobalSettings_CheckForOnlinePlayersTooltip">If enabled, the shutdown process will check if players are online. If no player are online, the grace period will be bypassed and shutdown will happen immediately. Otherwise the shutdown will wait until the grace period timer runs out.</sys:String>
     <sys:String x:Key="GlobalSettings_SendShutdownMessagesLabel">Send Shutdown Messages to Game Client</sys:String>
     <sys:String x:Key="GlobalSettings_SendShutdownMessagesTooltip">If enabled, the shutdown messages will be sent to the game client via RCON. NOTE: RCON must be enable on the server.</sys:String>
     <sys:String x:Key="GlobalSettings_ShutdownGraceIntervalLabel">Grace Period:</sys:String>
@@ -1078,8 +1071,8 @@
     <sys:String x:Key="ServerSettings_ClearBlacklistedPlayerTooltip">Clear Blacklisted Players</sys:String>
     <sys:String x:Key="ServerSettings_ReloadBlacklistedPlayerTooltip">Reload from File</sys:String>
     <sys:String x:Key="ServerSettings_RemoveBlacklistedPlayerTooltip">Delete Blacklisted Player</sys:String>
-    <sys:String x:Key="ServerSettings_ServerFilesBlacklistedIdColumnLabel">Steam ID</sys:String>
-    <sys:String x:Key="ServerSettings_ServerFilesBlacklistedNameColumnLabel">Steam Name</sys:String>
+    <sys:String x:Key="ServerSettings_ServerFilesBlacklistedIdColumnLabel">Player Id</sys:String>
+    <sys:String x:Key="ServerSettings_ServerFilesBlacklistedNameColumnLabel">Player Name</sys:String>
 
     <sys:String x:Key="ServerSettings_ServerFilesWhitelistedLabel">Enable Whitelist</sys:String>
     <sys:String x:Key="ServerSettings_ServerFilesWhitelistedTooltip">If enabled, only whitelised players will be able to join the server.</sys:String>
@@ -1087,8 +1080,8 @@
     <sys:String x:Key="ServerSettings_ClearWhitelistedPlayerTooltip">Clear Whitelisted Players</sys:String>
     <sys:String x:Key="ServerSettings_ReloadWhitelistedPlayerTooltip">Reload from File</sys:String>
     <sys:String x:Key="ServerSettings_RemoveWhitelistedPlayerTooltip">Delete Whitelisted Player</sys:String>
-    <sys:String x:Key="ServerSettings_ServerFilesWhitelistedIdColumnLabel">Steam ID</sys:String>
-    <sys:String x:Key="ServerSettings_ServerFilesWhitelistedNameColumnLabel">Steam Name</sys:String>
+    <sys:String x:Key="ServerSettings_ServerFilesWhitelistedIdColumnLabel">Player Id</sys:String>
+    <sys:String x:Key="ServerSettings_ServerFilesWhitelistedNameColumnLabel">Player Name</sys:String>
     <!--#endregion-->
     <!--#endregion-->
 
diff --git a/CSM/latest.exe b/CSM/latest.exe
index 5ccf31c2..b28e65ee 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index f7bea765..7b3892dd 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.1.37
+1.1.38
diff --git a/CSM/latest.zip b/CSM/latest.zip
index c86e15fd..388d58fb 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ