diff --git a/GPW.sln b/GPW.sln
index 7d9df5c..b45e0f0 100644
--- a/GPW.sln
+++ b/GPW.sln
@@ -13,206 +13,26 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		218_SP|Any CPU = 218_SP|Any CPU
-		218_test|Any CPU = 218_test|Any CPU
-		Alumat|Any CPU = Alumat|Any CPU
-		CMS|Any CPU = CMS|Any CPU
 		Debug|Any CPU = Debug|Any CPU
-		DEMO|Any CPU = DEMO|Any CPU
-		deploy|Any CPU = deploy|Any CPU
-		EQUA|Any CPU = EQUA|Any CPU
-		ETS|Any CPU = ETS|Any CPU
-		ETS-218|Any CPU = ETS-218|Any CPU
-		IIS|Any CPU = IIS|Any CPU
-		IIS01_SP|Any CPU = IIS01_SP|Any CPU
-		IIS01_TK|Any CPU = IIS01_TK|Any CPU
-		IIS01|Any CPU = IIS01|Any CPU
-		IIS02_SP|Any CPU = IIS02_SP|Any CPU
-		IIS02_TK|Any CPU = IIS02_TK|Any CPU
-		IIS02|Any CPU = IIS02|Any CPU
-		MoonProDemo-OVH|Any CPU = MoonProDemo-OVH|Any CPU
 		Release|Any CPU = Release|Any CPU
-		SomaschiniUSA|Any CPU = SomaschiniUSA|Any CPU
-		Steamware|Any CPU = Steamware|Any CPU
-		WinLab|Any CPU = WinLab|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.ActiveCfg = 218_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_SP|Any CPU.Build.0 = 218_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.ActiveCfg = 218_test|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.218_test|Any CPU.Build.0 = 218_test|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.ActiveCfg = Alumat|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Alumat|Any CPU.Build.0 = Alumat|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.ActiveCfg = CMS|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.CMS|Any CPU.Build.0 = CMS|Any CPU
 		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.ActiveCfg = DEMO|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.DEMO|Any CPU.Build.0 = DEMO|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.ActiveCfg = deploy|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.deploy|Any CPU.Build.0 = deploy|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.ActiveCfg = EQUA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.EQUA|Any CPU.Build.0 = EQUA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.ActiveCfg = ETS|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS|Any CPU.Build.0 = ETS|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.ActiveCfg = ETS-218|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.ETS-218|Any CPU.Build.0 = ETS-218|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS|Any CPU.ActiveCfg = IIS|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS|Any CPU.Build.0 = IIS|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_SP|Any CPU.ActiveCfg = IIS01_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_SP|Any CPU.Build.0 = IIS01_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_TK|Any CPU.ActiveCfg = IIS01_TK|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01_TK|Any CPU.Build.0 = IIS01_TK|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS01|Any CPU.Build.0 = IIS01|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_SP|Any CPU.ActiveCfg = IIS02_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_SP|Any CPU.Build.0 = IIS02_SP|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_TK|Any CPU.ActiveCfg = IIS02_TK|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02_TK|Any CPU.Build.0 = IIS02_TK|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.MoonProDemo-OVH|Any CPU.ActiveCfg = MoonProDemo-OVH|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.MoonProDemo-OVH|Any CPU.Build.0 = MoonProDemo-OVH|Any CPU
 		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.ActiveCfg = SomaschiniUSA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.SomaschiniUSA|Any CPU.Build.0 = SomaschiniUSA|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.ActiveCfg = Steamware|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.Steamware|Any CPU.Build.0 = Steamware|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU
-		{2872DCFE-8B46-43B2-BAA0-842A816A2DD5}.WinLab|Any CPU.Build.0 = WinLab|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.218_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.218_SP|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.218_test|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.218_test|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Alumat|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.CMS|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.CMS|Any CPU.Build.0 = Release|Any CPU
 		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.DEMO|Any CPU.Build.0 = Debug|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.deploy|Any CPU.ActiveCfg = Debug|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.deploy|Any CPU.Build.0 = Debug|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.EQUA|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.EQUA|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.ETS|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.ETS|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.ETS-218|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS01_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS01_SP|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS01_TK|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS01_TK|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS01|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS02_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS02_SP|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS02_TK|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS02_TK|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.IIS02|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.MoonProDemo-OVH|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.MoonProDemo-OVH|Any CPU.Build.0 = Release|Any CPU
 		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Steamware|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.Steamware|Any CPU.Build.0 = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
-		{6427F4E4-105A-4918-BAB4-5F94234320E4}.WinLab|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.218_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.218_SP|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.218_test|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.218_test|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Alumat|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.CMS|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.CMS|Any CPU.Build.0 = Release|Any CPU
 		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.DEMO|Any CPU.Build.0 = Debug|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.deploy|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.deploy|Any CPU.Build.0 = Debug|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.EQUA|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.EQUA|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.ETS|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.ETS|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.ETS-218|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01_SP|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01_TK|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01_TK|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS01|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS02_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS02_SP|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS02_TK|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS02_TK|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.IIS02|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.MoonProDemo-OVH|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.MoonProDemo-OVH|Any CPU.Build.0 = Release|Any CPU
 		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Steamware|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.Steamware|Any CPU.Build.0 = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
-		{7BEA5D99-8486-4592-B01D-FE2C76EB66CF}.WinLab|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.218_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.218_SP|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.218_test|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.218_test|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Alumat|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Alumat|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.CMS|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.CMS|Any CPU.Build.0 = Release|Any CPU
 		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.DEMO|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.DEMO|Any CPU.Build.0 = Debug|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.deploy|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.deploy|Any CPU.Build.0 = Debug|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.EQUA|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.EQUA|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.ETS|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.ETS|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.ETS-218|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.ETS-218|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01_SP|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01_TK|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01_TK|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS01|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS02_SP|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS02_SP|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS02_TK|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS02_TK|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.IIS02|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.MoonProDemo-OVH|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.MoonProDemo-OVH|Any CPU.Build.0 = Release|Any CPU
 		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SomaschiniUSA|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.SomaschiniUSA|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Steamware|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.Steamware|Any CPU.Build.0 = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.WinLab|Any CPU.ActiveCfg = Release|Any CPU
-		{A8543046-1C1B-4810-BC08-9AA7F9814BB0}.WinLab|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/GPW/ExtLib/SteamWare.dll b/GPW/ExtLib/SteamWare.dll
index 30badec..3a702bf 100644
Binary files a/GPW/ExtLib/SteamWare.dll and b/GPW/ExtLib/SteamWare.dll differ
diff --git a/GPW/GPW.csproj b/GPW/GPW.csproj
index a047795..0dcf6b0 100644
--- a/GPW/GPW.csproj
+++ b/GPW/GPW.csproj
@@ -72,10 +72,6 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="SteamWare, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>ExtLib\SteamWare.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -1429,6 +1425,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\SteamWareLib\SteamWare.csproj">
+      <Project>{2872dcfe-8b46-43b2-baa0-842a816a2dd5}</Project>
+      <Name>SteamWare</Name>
+    </ProjectReference>
     <ProjectReference Include="..\GPW_Data\GPW_Data.csproj">
       <Project>{7bea5d99-8486-4592-b01d-fe2c76eb66cf}</Project>
       <Name>GPW_Data</Name>
diff --git a/GPW/WebMasterPages/AjaxSearch.master b/GPW/WebMasterPages/AjaxSearch.master
index 0073206..a9cb3fe 100644
--- a/GPW/WebMasterPages/AjaxSearch.master
+++ b/GPW/WebMasterPages/AjaxSearch.master
@@ -7,108 +7,101 @@
 <%@ Register Src="../WebUserControls/mod_ricercaGenerica.ascx" TagName="mod_ricercaGenerica" TagPrefix="uc4" %>
 <%@ Register Src="../WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc5" %>
 <%@ Register Src="../WebUserControls/mod_pageSize.ascx" TagName="mod_pageSize" TagPrefix="uc6" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head id="Head1" runat="server">
-    <title>GPWS</title>
-    <link href="../css/Style.css" rel="stylesheet" type="text/css" />
-    <link rel="icon" href="~/images/favicon.png" type="image/png" />
-    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
-    <link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
-    <%--link CDN--%>
-    <%--<script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery/jquery-3.1.1.min.js"></script>
-    <script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.9.0/jquery-ui.min.js"></script>--%>
-    <%--link librerie locali--%>
-    <script src="../Scripts/jquery-3.1.1.min.js" type="text/javascript"></script>
-    <script src="../Scripts/jquery-ui-1.12.1.min.js" type="text/javascript"></script>
-    <link href="../Content/themes/Steamware/css/steamware/jquery-ui-1.12.1.custom.min.css" rel="stylesheet" type="text/css" />
-    <script language="javascript" type="text/javascript">
-        $(document).ready(function () {
-            $("span.radioBtn input").checkboxradio({ icon: false });
-            $("#accordion").accordion({
-                heightStyle: "content"
-            });
 
-            // oggetto da legare all'update parziale ajax x sistemare btns & co
-            var prm = Sys.WebForms.PageRequestManager.getInstance();
-            prm.add_endRequest(function () {
-                // re-bind your jQuery events here
-                $("span.radioBtn input").checkboxradio({ icon: false });
-                $("#accordion").accordion({
-                    heightStyle: "content"
-                });
-            });
-        });
-    </script>
+<!DOCTYPE html>
+
+<html lang="it">
+<head id="Head1" runat="server">
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title><%: Page.Title %> - GPW</title>
+    <asp:PlaceHolder runat="server">
+        <%: Scripts.Render("~/bundles/modernizr") %>
+    </asp:PlaceHolder>
+
+    <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
+    <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
+
+    <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link rel="icon" href="~/images/favicon.png" type="image/png" />
+    <link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
+
+    <asp:PlaceHolder ID="PlaceHolder1" runat="server">
+        <%: Scripts.Render("~/bundles/jquery") %>
+        <%: Scripts.Render("~/bundles/jqueryui") %>
+        <%: Scripts.Render("~/bundles/jSteamware") %>
+        <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%>
+    </asp:PlaceHolder>
+
+    <%--DA VERIFICARE QUESTI in inclusione...--%>
+    <link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
+    <link href="../Content/StyleCustom.css" rel="stylesheet" type="text/css" />
 </head>
 <body class="body">
     <form id="form1" runat="server">
-    <%--<asp:ToolkitScriptManager ID="tsm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true"
-         EnableScriptLocalization="true" EnableCdn="false">
-    </asp:ToolkitScriptManager>--%>
-    <asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true"
-        EnableCdn="false">
-    </asp:ScriptManager>
-    <div class="fullscreen">
-        <table class="formatTableGeneral" id="tblFormat" cellspacing="0" cellpadding="0">
-            <tr>
-                <td class="topMenu" colspan="2">
-                    <div>
-                        <asp:UpdatePanel ID="upTop" runat="server" UpdateMode="Conditional" RenderMode="Inline">
+        <asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true"
+            EnableCdn="false">
+        </asp:ScriptManager>
+        <div class="fullscreen">
+            <table class="formatTableGeneral" id="tblFormat" cellspacing="0" cellpadding="0">
+                <tr>
+                    <td class="topMenu" colspan="2">
+                        <div>
+                            <asp:UpdatePanel ID="upTop" runat="server" UpdateMode="Conditional" RenderMode="Inline">
+                                <ContentTemplate>
+                                    <uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
+                                </ContentTemplate>
+                            </asp:UpdatePanel>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td class="menuSx">
+                        <asp:UpdatePanel ID="upSx" runat="server" UpdateMode="Always" RenderMode="Inline">
                             <ContentTemplate>
-                                <uc1:mod_menuTop ID="Mod_menuTop1" runat="server" />
+                                <uc2:mod_menuSx ID="Mod_menuSx1" runat="server" />
                             </ContentTemplate>
                         </asp:UpdatePanel>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td class="menuSx">
-                    <asp:UpdatePanel ID="upSx" runat="server" UpdateMode="Always" RenderMode="Inline">
-                        <ContentTemplate>
-                            <uc2:mod_menuSx ID="Mod_menuSx1" runat="server" />
-                        </ContentTemplate>
-                    </asp:UpdatePanel>
-                </td>
-                <td class="bodyMain">
-                    <div>
-                        <asp:UpdatePanel ID="upPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
-                            <ContentTemplate>
-                                <div class="boxShadowDark">
-                                    <table class="tableContenuto" cellpadding="0" cellspacing="0">
-                                        <tr class="topContrDx">
-                                            <td style="width: 25%;" valign="baseline">
-                                                <uc3:mod_pageTitleAndSearch ID="Mod_pageTitleAndSearch1" runat="server" />
-                                            </td>
-                                            <td style="width: 75%; text-align: left;">
-                                                <div class="divSx">
-                                                    <uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" />
-                                                </div>
-                                                <div class="divDx">
-                                                    <uc6:mod_pageSize ID="mod_pageSize1" runat="server" />
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td colspan="2" class="contrRiq">
-                                                <asp:ContentPlaceHolder ID="cph1" runat="server">
-                                                </asp:ContentPlaceHolder>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </div>
-                            </ContentTemplate>
-                        </asp:UpdatePanel>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2" class="bottomWrite">
-                    <uc5:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
-                </td>
-            </tr>
-        </table>
-    </div>
+                    </td>
+                    <td class="bodyMain">
+                        <div>
+                            <asp:UpdatePanel ID="upPagina" runat="server" UpdateMode="Conditional" RenderMode="Inline">
+                                <ContentTemplate>
+                                    <div class="boxShadowDark">
+                                        <table class="tableContenuto" cellpadding="0" cellspacing="0">
+                                            <tr class="topContrDx">
+                                                <td style="width: 25%;" valign="baseline">
+                                                    <uc3:mod_pageTitleAndSearch ID="Mod_pageTitleAndSearch1" runat="server" />
+                                                </td>
+                                                <td style="width: 75%; text-align: left;">
+                                                    <div class="divSx">
+                                                        <uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" />
+                                                    </div>
+                                                    <div class="divDx">
+                                                        <uc6:mod_pageSize ID="mod_pageSize1" runat="server" />
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <td colspan="2" class="contrRiq">
+                                                    <asp:ContentPlaceHolder ID="cph1" runat="server">
+                                                    </asp:ContentPlaceHolder>
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </div>
+                                </ContentTemplate>
+                            </asp:UpdatePanel>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="2" class="bottomWrite">
+                        <uc5:mod_menuBottom ID="Mod_menuBottom1" runat="server" />
+                    </td>
+                </tr>
+            </table>
+        </div>
     </form>
 </body>
 </html>
diff --git a/GPW/WebMasterPages/AjaxSearch.master.designer.cs b/GPW/WebMasterPages/AjaxSearch.master.designer.cs
index 82b8d40..40039c1 100644
--- a/GPW/WebMasterPages/AjaxSearch.master.designer.cs
+++ b/GPW/WebMasterPages/AjaxSearch.master.designer.cs
@@ -20,6 +20,33 @@ public partial class AjaxSearch {
     /// </remarks>
     protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
     
+    /// <summary>
+    /// BundleReference1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
+    
+    /// <summary>
+    /// BundleReference2 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
+    
+    /// <summary>
+    /// PlaceHolder1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
+    
     /// <summary>
     /// form1 control.
     /// </summary>
diff --git a/GPW/WebMasterPages/MasterAjax.master b/GPW/WebMasterPages/MasterAjax.master
index deecc82..8f1df09 100644
--- a/GPW/WebMasterPages/MasterAjax.master
+++ b/GPW/WebMasterPages/MasterAjax.master
@@ -3,27 +3,42 @@
 <%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
 <%@ Register Src="../WebUserControls/mod_menuTop.ascx" TagName="mod_menuTop" TagPrefix="uc1" %>
 <%@ Register Src="../WebUserControls/mod_menuSx.ascx" TagName="mod_menuSx" TagPrefix="uc2" %>
-<%@ Register Src="../WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom"
-    TagPrefix="uc5" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="it">
+<%@ Register Src="../WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom" TagPrefix="uc5" %>
+
+<!DOCTYPE html>
+
+<html lang="it">
 <head id="Head1" runat="server">
-    <title></title>
-    <link href="../css/Style.css" rel="stylesheet" type="text/css" />
-    <link rel="icon" href="~/images/favicon.png" type="image/png" />
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title><%: Page.Title %> - GPW</title>
+     <asp:PlaceHolder runat="server">
+        <%: Scripts.Render("~/bundles/modernizr") %>
+    </asp:PlaceHolder>
+
+    <webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
+    <webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
+
     <link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link rel="icon" href="~/images/favicon.png" type="image/png" />
     <link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
-    <%--link librerie locali--%>
-    <script src="../Scripts/jquery-3.1.1.min.js" type="text/javascript"></script>
-    <script src="../Scripts/jquery-ui-1.12.1.min.js" type="text/javascript"></script>
-    <link href="../Content/themes/Steamware/css/steamware/jquery-ui-1.12.1.custom.min.css" rel="stylesheet" type="text/css" />
+
+    <asp:PlaceHolder ID="PlaceHolder1" runat="server">
+        <%: Scripts.Render("~/bundles/jquery") %>
+        <%: Scripts.Render("~/bundles/jqueryui") %>
+        <%: Scripts.Render("~/bundles/jSteamware") %>
+        <%--<%: Scripts.Render("~/bundles/jquerymobile") %>--%>
+    </asp:PlaceHolder>
+
+
+    <%--DA VERIFICARE QUESTI in inclusione...--%>
+    <link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
+    <link href="../Content/StyleCustom.css" rel="stylesheet" type="text/css" />
+
+    <%--<link href="../Content/themes/Steamware/css/steamware/jquery-ui-1.12.1.custom.min.css" rel="stylesheet" type="text/css" />--%>
 </head>
 <body class="body">
     <form id="form1" runat="server">
-        <%--<asp:ToolkitScriptManager ID="tsm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true"
-        EnableCdn="true">
-    </asp:ToolkitScriptManager>--%>
-        <%--<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableCdn="true"></asp:ScriptManager>--%>
         <asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableCdn="false"></asp:ScriptManager>
         <div class="fullscreen">
             <table class="formatTableGeneral" id="tblFormat" cellspacing="0" cellpadding="0">
diff --git a/GPW/WebMasterPages/MasterAjax.master.designer.cs b/GPW/WebMasterPages/MasterAjax.master.designer.cs
index 6666301..e62839c 100644
--- a/GPW/WebMasterPages/MasterAjax.master.designer.cs
+++ b/GPW/WebMasterPages/MasterAjax.master.designer.cs
@@ -20,6 +20,33 @@ public partial class MasterAjax {
     /// </remarks>
     protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
     
+    /// <summary>
+    /// BundleReference1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
+    
+    /// <summary>
+    /// BundleReference2 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
+    
+    /// <summary>
+    /// PlaceHolder1 control.
+    /// </summary>
+    /// <remarks>
+    /// Auto-generated field.
+    /// To modify move field declaration from designer file to code-behind file.
+    /// </remarks>
+    protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
+    
     /// <summary>
     /// form1 control.
     /// </summary>
diff --git a/GPW/WebUserControls/mod_pageTitleAndSearch.ascx.cs b/GPW/WebUserControls/mod_pageTitleAndSearch.ascx.cs
index d3768a1..98f5024 100644
--- a/GPW/WebUserControls/mod_pageTitleAndSearch.ascx.cs
+++ b/GPW/WebUserControls/mod_pageTitleAndSearch.ascx.cs
@@ -17,7 +17,7 @@ public partial class mod_pageTitleAndSearch : ApplicationUserControl
     protected string _titolo;
     protected override void traduciObj()
     {
-        DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", _paginaCorrente))[0];
+        DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}' OR URL = '{0}.aspx'", _paginaCorrente))[0];
         _titolo = riga.NOME;
         lblTitolo.Text = traduci(_titolo);
     }