Merge branch 'master' into master-git

Author: lucidlemon

PraiseTheSave/App.config

@@ -16,35 +16,23 @@
             <setting name="SaveInterval" serializeAs="String">
                 <value>60</value>
             </setting>
-            <setting name="LastDS3Change" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="LastDS2Change" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="LastDS1Change" serializeAs="String">
-                <value />
-            </setting>
             <setting name="SaveAmount" serializeAs="String">
                 <value>5</value>
             </setting>
-            <setting name="ds3location" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="ds2location" serializeAs="String">
-                <value />
-            </setting>
-            <setting name="ds1location" serializeAs="String">
-                <value />
-            </setting>
             <setting name="AutomaticBackups" serializeAs="String">
                 <value>False</value>
             </setting>
-            <setting name="LastDS1RChange" serializeAs="String">
-                <value />
+            <setting name="dirDS1" serializeAs="String">
+                <value>ds1</value>
+            </setting>
+            <setting name="dirDS2" serializeAs="String">
+                <value>ds3</value>
+            </setting>
+            <setting name="dirDS3" serializeAs="String">
+                <value>ds3</value>
             </setting>
-            <setting name="ds1Rlocation" serializeAs="String">
-                <value />
+            <setting name="dirDSR" serializeAs="String">
+                <value>ds1_remastered</value>
             </setting>
         </PraiseTheSave.Properties.Settings>
     </userSettings>