diff --git a/GMW/GMW.sln b/GMW/GMW.sln
index 28636663..47c76e7a 100644
--- a/GMW/GMW.sln
+++ b/GMW/GMW.sln
@@ -81,8 +81,8 @@ Global
 		{67AF6121-D250-44E3-9C4E-0FC36599AAE4}.Installer|Any CPU.Build.0 = Release|Any CPU
 		{67AF6121-D250-44E3-9C4E-0FC36599AAE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Deploy|Any CPU.Build.0 = Debug|Any CPU
+		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
+		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Deploy|Any CPU.Build.0 = Release|Any CPU
 		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Installer_Offline|Any CPU.ActiveCfg = Release|Any CPU
 		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Installer_Offline|Any CPU.Build.0 = Release|Any CPU
 		{F6B68E94-B7A6-4DC7-A08C-E760B9F95F9F}.Installer_test|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 97fceb4d..cee10835 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll
index 4ac965a3..784593bd 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 97fceb4d..cee10835 100644
Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ
diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache
index d93037e4..e928fb8e 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll
index 4ac965a3..784593bd 100644
Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll
index 4ac965a3..784593bd 100644
Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ
diff --git a/GMW/GMW_deploy/GMW_deploy.wdproj b/GMW/GMW_deploy/GMW_deploy.wdproj
index 98970d7f..b69670cc 100644
--- a/GMW/GMW_deploy/GMW_deploy.wdproj
+++ b/GMW/GMW_deploy/GMW_deploy.wdproj
@@ -21,6 +21,9 @@
     <EnableUpdateable>true</EnableUpdateable>
     <UseMerge>true</UseMerge>
     <SingleAssemblyName>GMW_deploy</SingleAssemblyName>
+    <UseWebConfigReplacement>true</UseWebConfigReplacement>
+    <DeleteAppDataFolder>true</DeleteAppDataFolder>
+    <ValidateWebConfigReplacement>false</ValidateWebConfigReplacement>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>
@@ -28,9 +31,28 @@
     <EnableUpdateable>true</EnableUpdateable>
     <UseMerge>true</UseMerge>
     <SingleAssemblyName>GMW_deploy</SingleAssemblyName>
+    <UseWebConfigReplacement>true</UseWebConfigReplacement>
+    <DeleteAppDataFolder>true</DeleteAppDataFolder>
+    <ValidateWebConfigReplacement>true</ValidateWebConfigReplacement>
   </PropertyGroup>
   <ItemGroup>
   </ItemGroup>
+  <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <WebConfigReplacementFiles Include="mazzAppSettings.config">
+      <Section>appSettings</Section>
+    </WebConfigReplacementFiles>
+    <WebConfigReplacementFiles Include="mazzConnectionStrings.config">
+      <Section>connectionStrings</Section>
+    </WebConfigReplacementFiles>
+  </ItemGroup>
+  <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <WebConfigReplacementFiles Include="mazzAppSettings.config">
+      <Section>appSettings</Section>
+    </WebConfigReplacementFiles>
+    <WebConfigReplacementFiles Include="mazzConnectionStrings.config">
+      <Section>connectionStrings</Section>
+    </WebConfigReplacementFiles>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WebDeployment\v9.0\Microsoft.WebDeployment.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.WebDeployment.targets.
diff --git a/GMW/GMW_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 9b5c1470..b79fffda 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ