diff --git a/CSM/ConanServerManager_1.0.17.exe b/CSM/ConanServerManager_1.0.17.exe
new file mode 100644
index 00000000..3ad7e84b
Binary files /dev/null and b/CSM/ConanServerManager_1.0.17.exe differ
diff --git a/CSM/ConanServerManager_1.0.17.zip b/CSM/ConanServerManager_1.0.17.zip
new file mode 100644
index 00000000..d6e6544f
Binary files /dev/null and b/CSM/ConanServerManager_1.0.17.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index f85790c4..c3320bc3 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,31 @@
   <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-03-03T00:00:00Z</updated>
+  <updated>2020-03-07T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:FCE4B9D9-9A1B-4A99-B2DD-364B53DD911D</id>
+    <title>1.0.17 (1.0.17.1)</title>
+    <summary>1.0.17.1</summary>
+    <link href="" />
+    <updated>2020-03-07T00: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;">NEW</u>
+          <br/>
+          <ul>
+            <li>Main Window - Added Game Data Window button to open a new Game Data window. Button is top right corner next to plugins button.</li>
+            <li>Game Data Window - A new window that allows you to manage your game data files.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:702FFCE2-CEFB-45C9-A5E6-C1619B39D2DE</id>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index fb58af30..f26a8f27 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -234,6 +234,37 @@
     <sys:String x:Key="ProfileSyncWindow_SectionNameColumnLabel">Section</sys:String>
     <!--#endregion-->
 
+    <!--#region GameData Window -->
+    <sys:String x:Key="GameDataWindow_Title">Game Data Files</sys:String>
+
+    <sys:String x:Key="GameDataWindow_AddGameDataTooltip">Add Game Data File</sys:String>
+    <sys:String x:Key="GameDataWindow_ClearGameDataTooltip">Delete All User Game Data Files</sys:String>
+    <sys:String x:Key="GameDataWindow_OpenGameDataFolderTooltip">Open Game Data Folder</sys:String>
+    <sys:String x:Key="GameDataWindow_GameDataForumTooltip">Open Game Data Forum</sys:String>
+    <sys:String x:Key="GameDataWindow_ReloadGameDataTooltip">Reload Game Data Files</sys:String>
+    <sys:String x:Key="GameDataWindow_RemoveGameDataTooltip">Delete Game Data File</sys:String>
+
+    <sys:String x:Key="GameDataWindow_NameColumnLabel">Name</sys:String>
+    <sys:String x:Key="GameDataWindow_VersionColumnLabel">Version</sys:String>
+    <sys:String x:Key="GameDataWindow_DateColumnLabel">Created Date</sys:String>
+
+    <sys:String x:Key="GameDataWindow_AddErrorTitle">Add Action Error</sys:String>
+    <sys:String x:Key="GameDataWindow_AddErrorLabel">An error occurred while reading the selected file.</sys:String>
+    <sys:String x:Key="GameDataWindow_ClearTitle">Confirm Clear Action</sys:String>
+    <sys:String x:Key="GameDataWindow_ClearLabel">Click 'Yes' to confirm you want to clear all.</sys:String>
+    <sys:String x:Key="GameDataWindow_ClearErrorTitle">Clear Action Error</sys:String>
+    <sys:String x:Key="GameDataWindow_DeleteTitle">Confirm Delete Action</sys:String>
+    <sys:String x:Key="GameDataWindow_DeleteLabel">Click 'Yes' to confirm you want to perform the delete.</sys:String>
+    <sys:String x:Key="GameDataWindow_DeleteErrorTitle">Delete Action Error</sys:String>
+    <sys:String x:Key="GameDataWindow_OpenErrorTitle">Open Folder Error</sys:String>
+    <sys:String x:Key="GameDataWindow_LoadErrorTitle">Load Error</sys:String>
+
+    <sys:String x:Key="GameDataWindow_AddDialogTitle">Select game data file</sys:String>
+    <sys:String x:Key="GameDataWindow_GameDataDefaultExtension">gamedata</sys:String>
+    <sys:String x:Key="GameDataWindow_AddFilterLabel">Game Data Files</sys:String>
+    <sys:String x:Key="GameDataWindow_AddFilterExtension">*.gamedata</sys:String>
+    <!--#endregion-->
+
     <!--#region Plugins Window -->
     <sys:String x:Key="PluginsWindow_Title">Plugins</sys:String>
 
@@ -458,6 +489,7 @@
     <sys:String x:Key="MainWindow_OpenRCONTooltip">Open remote console</sys:String>
     <sys:String x:Key="MainWindow_OpenLogFolderTooltip">Open Server Manager logs folder</sys:String>
     <sys:String x:Key="MainWindow_OpenSettingsTooltip">Open Global Settings</sys:String>
+    <sys:String x:Key="MainWindow_OpenGameDataTooltip">Open Game Data</sys:String>
     <sys:String x:Key="MainWindow_OpenPluginsTooltip">Open Plugins</sys:String>
     <sys:String x:Key="MainWindow_OpenHelpTooltip">Open Help</sys:String>
     <sys:String x:Key="MainWindow_UpdateToLabelFormat">Upgrade to {0} now!</sys:String>
diff --git a/CSM/latest.exe b/CSM/latest.exe
index c3779778..3ad7e84b 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index f260bfd7..d1aa8e52 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.0.16
+1.0.17
diff --git a/CSM/latest.zip b/CSM/latest.zip
index 613fe0e0..d6e6544f 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ