diff --git a/AyaNovaSolution.sln b/AyaNovaSolution.sln
index 79e99cb..a042e6d 100644
--- a/AyaNovaSolution.sln
+++ b/AyaNovaSolution.sln
@@ -150,7 +150,6 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{50B807B6-FC35-4CC3-B54D-91C78426A943}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{50B807B6-FC35-4CC3-B54D-91C78426A943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50B807B6-FC35-4CC3-B54D-91C78426A943}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50B807B6-FC35-4CC3-B54D-91C78426A943}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{50B807B6-FC35-4CC3-B54D-91C78426A943}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{50B807B6-FC35-4CC3-B54D-91C78426A943}.Debug|WBI.ActiveCfg = Debug|Any CPU
@@ -190,7 +189,6 @@ Global
 		{50B807B6-FC35-4CC3-B54D-91C78426A943}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{82EA0692-8199-45D6-8726-CA49EE893299}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{82EA0692-8199-45D6-8726-CA49EE893299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82EA0692-8199-45D6-8726-CA49EE893299}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{82EA0692-8199-45D6-8726-CA49EE893299}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{82EA0692-8199-45D6-8726-CA49EE893299}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{82EA0692-8199-45D6-8726-CA49EE893299}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -223,7 +221,6 @@ Global
 		{82EA0692-8199-45D6-8726-CA49EE893299}.ReleaseX86AyaNova|x86.ActiveCfg = Debug|Any CPU
 		{FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{FE5614F3-E435-423C-A23D-E3372B7EAEAB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -260,7 +257,6 @@ Global
 		{FE5614F3-E435-423C-A23D-E3372B7EAEAB}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{701893AA-C042-4FB2-8643-E139372C1117}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{701893AA-C042-4FB2-8643-E139372C1117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{701893AA-C042-4FB2-8643-E139372C1117}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{701893AA-C042-4FB2-8643-E139372C1117}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{701893AA-C042-4FB2-8643-E139372C1117}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{701893AA-C042-4FB2-8643-E139372C1117}.Debug|WBI.Build.0 = Debug|Any CPU
@@ -299,7 +295,6 @@ Global
 		{701893AA-C042-4FB2-8643-E139372C1117}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{EDE897E2-E2E6-441D-9F83-0B973AE09670}.Debug|WBI.Build.0 = Debug|Any CPU
@@ -338,7 +333,6 @@ Global
 		{EDE897E2-E2E6-441D-9F83-0B973AE09670}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{1B9A38BB-461A-47A4-AD72-099C694138A0}.Debug|WBI.Build.0 = Debug|Any CPU
@@ -377,7 +371,6 @@ Global
 		{1B9A38BB-461A-47A4-AD72-099C694138A0}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{C2392355-12A9-4197-A1D3-603C390B1E62}.Debug|WBI.Build.0 = Debug|Any CPU
@@ -416,7 +409,6 @@ Global
 		{C2392355-12A9-4197-A1D3-603C390B1E62}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{80828E2C-E9FB-4E73-A27C-7F9CDB96FCDE}.Debug|WBI.Build.0 = Debug|Any CPU
@@ -456,7 +448,6 @@ Global
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Debug|.NET.Build.0 = Debug|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
@@ -495,7 +486,6 @@ Global
 		{3EF693E1-F60E-4D0F-929C-CBF8BEF96F12}.ReleaseX86AyaNova|x86.Build.0 = Release|x86
 		{3A426361-1480-49A3-B596-53ABB98087F9}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{3A426361-1480-49A3-B596-53ABB98087F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A426361-1480-49A3-B596-53ABB98087F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A426361-1480-49A3-B596-53ABB98087F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{3A426361-1480-49A3-B596-53ABB98087F9}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{3A426361-1480-49A3-B596-53ABB98087F9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -529,7 +519,6 @@ Global
 		{3A426361-1480-49A3-B596-53ABB98087F9}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -564,7 +553,6 @@ Global
 		{EF51C1E7-8944-471D-A7CC-FC36DA2C0360}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{5083ED09-C394-48E7-B9DA-53A4CCA2D505}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{5083ED09-C394-48E7-B9DA-53A4CCA2D505}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5083ED09-C394-48E7-B9DA-53A4CCA2D505}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5083ED09-C394-48E7-B9DA-53A4CCA2D505}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5083ED09-C394-48E7-B9DA-53A4CCA2D505}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{5083ED09-C394-48E7-B9DA-53A4CCA2D505}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -599,7 +587,6 @@ Global
 		{5083ED09-C394-48E7-B9DA-53A4CCA2D505}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{6EF350F8-7676-416B-8CE9-6DB9B14CCB41}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -631,7 +618,6 @@ Global
 		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|.NET.Build.0 = Debug|Any CPU
 		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -666,7 +652,6 @@ Global
 		{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.Debug|x64.ActiveCfg = Debug|x64
@@ -701,7 +686,6 @@ Global
 		{F14E1944-51B4-4998-8D9B-BEAE2A756FE4}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{AA1D8C90-D676-4438-8C68-DB9AA1783396}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -734,7 +718,6 @@ Global
 		{AA1D8C90-D676-4438-8C68-DB9AA1783396}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.Debug|WBI.ActiveCfg = Debug|Any CPU
@@ -768,7 +751,6 @@ Global
 		{0CD14576-A3D4-4CBD-A8E6-F8BD3EEAA4B7}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{122B13D1-19DD-47AD-B030-A209167EF258}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{122B13D1-19DD-47AD-B030-A209167EF258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{122B13D1-19DD-47AD-B030-A209167EF258}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{122B13D1-19DD-47AD-B030-A209167EF258}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{122B13D1-19DD-47AD-B030-A209167EF258}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{122B13D1-19DD-47AD-B030-A209167EF258}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -801,7 +783,6 @@ Global
 		{122B13D1-19DD-47AD-B030-A209167EF258}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -834,7 +815,6 @@ Global
 		{4C39FEAD-9F24-49BE-A36E-98990DE3FF3C}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{19024613-F5C6-42A5-B02D-CECD8B20BF77}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -867,7 +847,6 @@ Global
 		{19024613-F5C6-42A5-B02D-CECD8B20BF77}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.Debug|WBI.ActiveCfg = Debug|Any CPU
@@ -901,7 +880,6 @@ Global
 		{42EE07F1-2AD8-4717-A85B-7E2DB97A625E}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -934,7 +912,6 @@ Global
 		{F04AF6D0-FCEE-4709-ADC6-7274749C06E6}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -967,7 +944,6 @@ Global
 		{0082F005-55A8-4C02-ACCD-111B1D8D1CBB}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|WBI.ActiveCfg = Debug|Any CPU
 		{A9445D98-9E04-4A53-A6D7-441E97345975}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1000,7 +976,6 @@ Global
 		{A9445D98-9E04-4A53-A6D7-441E97345975}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|.NET.ActiveCfg = Debug|x86
 		{A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|WBI.ActiveCfg = Debug|x86
 		{A65F3152-E70D-47B6-8928-7AA52567BE8D}.Debug|x64.ActiveCfg = Debug|x86
@@ -1033,6 +1008,7 @@ Global
 		{A65F3152-E70D-47B6-8928-7AA52567BE8D}.ReleaseX86AyaNova|x86.Build.0 = Release|x86
 		{58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{58F36D78-4BBA-4A70-8EAB-A6D414663233}.Debug|WBI.ActiveCfg = Debug|Any CPU
@@ -1064,7 +1040,6 @@ Global
 		{58F36D78-4BBA-4A70-8EAB-A6D414663233}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|.NET.ActiveCfg = Debug|x86
 		{CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{CE73BA18-914D-4426-8888-1DA0F0FC4764}.Debug|WBI.ActiveCfg = Debug|x86
@@ -1098,7 +1073,6 @@ Global
 		{CE73BA18-914D-4426-8888-1DA0F0FC4764}.ReleaseX86AyaNova|x86.Build.0 = Release|x86
 		{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|.NET.ActiveCfg = Debug|x86
 		{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -1135,7 +1109,6 @@ Global
 		{5407E64B-951B-414D-B532-4AF2EDBDD9FD}.ReleaseX86AyaNova|x86.Build.0 = Release|x86
 		{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.Debug|WBI.ActiveCfg = Debug|Any CPU
@@ -1167,7 +1140,6 @@ Global
 		{A2A29280-0267-4B9B-A122-C3ECDFC3CFC7}.ReleaseX86AyaNova|x86.ActiveCfg = Release|Any CPU
 		{B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{B3FF1D28-0DFC-48DC-8449-A86E0192D7EC}.Debug|WBI.ActiveCfg = Debug|Any CPU
diff --git a/source/AyaNova.PlugIn/AyaNova.PlugIn.csproj b/source/AyaNova.PlugIn/AyaNova.PlugIn.csproj
index d35ad4e..5734dfa 100644
--- a/source/AyaNova.PlugIn/AyaNova.PlugIn.csproj
+++ b/source/AyaNova.PlugIn/AyaNova.PlugIn.csproj
@@ -94,6 +94,7 @@
     <None Include="..\..\keys\AyaNova.snk">
       <Link>AyaNova.snk</Link>
     </None>
+    <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/source/MBI/Web.config b/source/MBI/Web.config
index a5514e1..557bfd8 100644
--- a/source/MBI/Web.config
+++ b/source/MBI/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<appSettings />
 	<connectionStrings />
@@ -18,4 +18,12 @@
 			<deny users="?" />
 		</authorization>	
     </system.web>    
+  <runtime>    
+         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">    
+                <dependentAssembly>    
+                       <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />    
+                       <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />    
+                </dependentAssembly>    
+         </assemblyBinding>    
+  </runtime>
 </configuration>
diff --git a/source/Plugins/AyaNova.PlugIn.AyaScript/AyaNova.PlugIn.AyaScript.csproj b/source/Plugins/AyaNova.PlugIn.AyaScript/AyaNova.PlugIn.AyaScript.csproj
index f8af978..739533d 100644
--- a/source/Plugins/AyaNova.PlugIn.AyaScript/AyaNova.PlugIn.AyaScript.csproj
+++ b/source/Plugins/AyaNova.PlugIn.AyaScript/AyaNova.PlugIn.AyaScript.csproj
@@ -137,6 +137,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resources\Script24.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.PlugIn.ImportExportCSV/AyaNova.PlugIn.ImportExportCSV.csproj b/source/Plugins/AyaNova.PlugIn.ImportExportCSV/AyaNova.PlugIn.ImportExportCSV.csproj
index 25643de..3f19207 100644
--- a/source/Plugins/AyaNova.PlugIn.ImportExportCSV/AyaNova.PlugIn.ImportExportCSV.csproj
+++ b/source/Plugins/AyaNova.PlugIn.ImportExportCSV/AyaNova.PlugIn.ImportExportCSV.csproj
@@ -228,6 +228,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resource\ImportExportCSV16.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.PlugIn.Merger/AyaNova.PlugIn.Merger.csproj b/source/Plugins/AyaNova.PlugIn.Merger/AyaNova.PlugIn.Merger.csproj
index 18c7878..9814f71 100644
--- a/source/Plugins/AyaNova.PlugIn.Merger/AyaNova.PlugIn.Merger.csproj
+++ b/source/Plugins/AyaNova.PlugIn.Merger/AyaNova.PlugIn.Merger.csproj
@@ -117,6 +117,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Merger32.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.ClientRemover/AyaNova.Plugin.ClientRemover.csproj b/source/Plugins/AyaNova.Plugin.ClientRemover/AyaNova.Plugin.ClientRemover.csproj
index 134f984..a42e8f5 100644
--- a/source/Plugins/AyaNova.Plugin.ClientRemover/AyaNova.Plugin.ClientRemover.csproj
+++ b/source/Plugins/AyaNova.Plugin.ClientRemover/AyaNova.Plugin.ClientRemover.csproj
@@ -103,6 +103,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="AyaNova.snk" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.Dump/AyaNova.Plugin.Dump.csproj b/source/Plugins/AyaNova.Plugin.Dump/AyaNova.Plugin.Dump.csproj
index 5d830ef..df2cf3c 100644
--- a/source/Plugins/AyaNova.Plugin.Dump/AyaNova.Plugin.Dump.csproj
+++ b/source/Plugins/AyaNova.Plugin.Dump/AyaNova.Plugin.Dump.csproj
@@ -106,6 +106,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="AyaNova.snk" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.ExportToExcel/AyaNova.Plugin.ExportToExcel.csproj b/source/Plugins/AyaNova.Plugin.ExportToExcel/AyaNova.Plugin.ExportToExcel.csproj
index b1495d2..3a1d04f 100644
--- a/source/Plugins/AyaNova.Plugin.ExportToExcel/AyaNova.Plugin.ExportToExcel.csproj
+++ b/source/Plugins/AyaNova.Plugin.ExportToExcel/AyaNova.Plugin.ExportToExcel.csproj
@@ -111,6 +111,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resources\ExportToExcel16.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.OutlookSchedule/AyaNova.Plugin.OutlookSchedule.csproj b/source/Plugins/AyaNova.Plugin.OutlookSchedule/AyaNova.Plugin.OutlookSchedule.csproj
index 34344b9..755c330 100644
--- a/source/Plugins/AyaNova.Plugin.OutlookSchedule/AyaNova.Plugin.OutlookSchedule.csproj
+++ b/source/Plugins/AyaNova.Plugin.OutlookSchedule/AyaNova.Plugin.OutlookSchedule.csproj
@@ -119,6 +119,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resources\OutlookSchedule.ico" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.PTI/AyaNova.PlugIn.PTI.csproj b/source/Plugins/AyaNova.Plugin.PTI/AyaNova.PlugIn.PTI.csproj
index 2808248..26a4c82 100644
--- a/source/Plugins/AyaNova.Plugin.PTI/AyaNova.PlugIn.PTI.csproj
+++ b/source/Plugins/AyaNova.Plugin.PTI/AyaNova.PlugIn.PTI.csproj
@@ -300,6 +300,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resources\Cancel16.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.QBI/AyaNova.PlugIn.QBI.csproj b/source/Plugins/AyaNova.Plugin.QBI/AyaNova.PlugIn.QBI.csproj
index 40779e2..e25e7c1 100644
--- a/source/Plugins/AyaNova.Plugin.QBI/AyaNova.PlugIn.QBI.csproj
+++ b/source/Plugins/AyaNova.Plugin.QBI/AyaNova.PlugIn.QBI.csproj
@@ -369,6 +369,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resources\Cancel16.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj b/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj
index b02a6a3..a38e034 100644
--- a/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj
+++ b/source/Plugins/AyaNova.Plugin.QBOI/AyaNova.PlugIn.QBOI.csproj
@@ -473,6 +473,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resources\Cancel16.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.QuickNotification/AyaNova.Plugin.QuickNotification.csproj b/source/Plugins/AyaNova.Plugin.QuickNotification/AyaNova.Plugin.QuickNotification.csproj
index 37100a8..562f0ce 100644
--- a/source/Plugins/AyaNova.Plugin.QuickNotification/AyaNova.Plugin.QuickNotification.csproj
+++ b/source/Plugins/AyaNova.Plugin.QuickNotification/AyaNova.Plugin.QuickNotification.csproj
@@ -118,6 +118,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Resources\QuickNotification16.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNova.Plugin.XTools/AyaNova.Plugin.XTools.csproj b/source/Plugins/AyaNova.Plugin.XTools/AyaNova.Plugin.XTools.csproj
index 06b1aed..4ff2a3a 100644
--- a/source/Plugins/AyaNova.Plugin.XTools/AyaNova.Plugin.XTools.csproj
+++ b/source/Plugins/AyaNova.Plugin.XTools/AyaNova.Plugin.XTools.csproj
@@ -117,6 +117,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="Xtools32.png" />
   </ItemGroup>
   <ItemGroup>
diff --git a/source/Plugins/AyaNovaOL/app.config b/source/Plugins/AyaNovaOL/app.config
index 2934b31..b17d83e 100644
--- a/source/Plugins/AyaNovaOL/app.config
+++ b/source/Plugins/AyaNovaOL/app.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -84,4 +84,13 @@
       </setting>
     </AyaNovaOL.Properties.Settings>
   </userSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/source/WBI/Bin/config.txt b/source/WBI/Bin/config.txt
index 00650d2..22da02d 100644
--- a/source/WBI/Bin/config.txt
+++ b/source/WBI/Bin/config.txt
@@ -5,7 +5,7 @@
 		<!-- VIRTUAL Use the test sql database -->
 	<ConnectionType>DataBase</ConnectionType>
 	<DataBaseType>MSSQL</DataBaseType>	
-    <DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=DevAyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>  	
+    <DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>  	
 	
 	<!-- Use the TEST embedded Firebird database	
 	<ConnectionType>DataBase</ConnectionType>
diff --git a/source/WBI/Web.Config b/source/WBI/Web.Config
index 6521ec1..49f6d9e 100644
--- a/source/WBI/Web.Config
+++ b/source/WBI/Web.Config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?> 
 <configuration>
   <configSections>
     <sectionGroup name="devExpress">
@@ -10,7 +10,7 @@
   <!-- AyaNova WBI skin selection-->
   <appSettings>
     <add key="Telerik.Skin" value="Hay" />
-    <add key ="IE9ForceCompatbilityMode" value="true"/>
+    <add key="IE9ForceCompatbilityMode" value="true" />
   </appSettings>
   <system.web>
     <compilation debug="true" targetFramework="4.0">
@@ -71,7 +71,7 @@
       <add name="RadCompression" type="Telerik.Web.UI.RadCompression" />
       <add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     </httpModules>
-    <httpRuntime requestValidationMode="2.0"/>
+    <httpRuntime requestValidationMode="2.0" />
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
@@ -106,4 +106,16 @@
     <themes enableThemesAssembly="true" />
     <errors callbackErrorRedirectUrl="" />
   </devExpress>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/source/WinFormApp/AyaNova.csproj b/source/WinFormApp/AyaNova.csproj
index ce6c080..77e9a00 100644
--- a/source/WinFormApp/AyaNova.csproj
+++ b/source/WinFormApp/AyaNova.csproj
@@ -156,10 +156,12 @@
     <Reference Include="DevExpress.Charts.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.Charts.v10.2.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.Data.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.Data.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.Data.v10.2.Compact, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -168,62 +170,77 @@
     <Reference Include="DevExpress.PivotGrid.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.PivotGrid.v10.2.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.RichEdit.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.RichEdit.v10.2.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.Utils.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.Utils.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraBars.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraBars.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraCharts.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraCharts.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraEditors.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraEditors.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraNavBar.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraNavBar.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraPivotGrid.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraPivotGrid.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraPrinting.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraPrinting.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraReports.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraReports.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraReports.v10.2.Extensions, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraReports.v10.2.Extensions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraRichEdit.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraRichEdit.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraScheduler.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraScheduler.v10.2.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraScheduler.v10.2.Core, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraScheduler.v10.2.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="DevExpress.XtraScheduler.v10.2.Reporting.Extensions, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdprtylibs\DevExpress\DevExpress.XtraScheduler.v10.2.Reporting.Extensions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <ProjectReference Include="..\AyaNova.PlugIn\AyaNova.PlugIn.csproj">
       <Project>{674BC3C9-4F74-4304-91ED-2EAFFFEB09A7}</Project>
@@ -260,7 +277,7 @@
     <Reference Include="log4net">
       <Name>log4net</Name>
       <HintPath>..\..\3rdprtylibs\log4net\log4net.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualBasic">
       <Name>Microsoft.VisualBasic</Name>
diff --git a/source/WinFormApp/app.config b/source/WinFormApp/app.config
index 7a26351..7a7f25b 100644
--- a/source/WinFormApp/app.config
+++ b/source/WinFormApp/app.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 <startup>
   <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
@@ -8,8 +8,12 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/source/WinFormApp/config.txt b/source/WinFormApp/config.txt
index 6b131ea..9878320 100644
--- a/source/WinFormApp/config.txt
+++ b/source/WinFormApp/config.txt
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	
-	<!-- Development test MSSQL DB 	
+	<!-- Development test MSSQL DB 	-->	
 	<ConnectionType>DataBase</ConnectionType>
 	<DataBaseType>MSSQL</DataBaseType>	
-    <DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=DevAyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>  	
-	  -->	 	
+    <DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password = abraxis;</DataBaseConnectionString>  	
+	   	
 	
 	<!-- Customer restored MSSQL DB   		
 	<ConnectionType>DataBase</ConnectionType>
@@ -13,11 +13,11 @@
     <DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova-XXXXX;User Id=sa; Password=abraxis;</DataBaseConnectionString>  	
 	 --> 	
 	
-	<!-- TEST embedded Firebird database  -->		 	
+	<!-- TEST embedded Firebird database  		 	
 	<ConnectionType>DataBase</ConnectionType>
 	<DataBaseType>FireBird</DataBaseType>	
    	<DataBaseConnectionString>ServerType=1;DataBase=C:\data\AyaNova\database\AYANOVA.fdb;Dialect=3;</DataBaseConnectionString>  	
-	
+	-->
 		
 
 	<!-- DataPortal		
diff --git a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL.csproj b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL.csproj
index 4a436b1..47728c7 100644
--- a/source/bizobjects/AyaLib/GZTW.AyaNova.BLL.csproj
+++ b/source/bizobjects/AyaLib/GZTW.AyaNova.BLL.csproj
@@ -46,6 +46,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <WebGreaseLibPath>..\..\..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug\</OutputPath>
@@ -107,6 +108,10 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="BouncyCastle.Crypto">
       <HintPath>..\..\..\3rdprtylibs\crypt\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
@@ -148,8 +153,13 @@
     <Reference Include="Microsoft.VisualBasic">
       <Name>Microsoft.VisualBasic</Name>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\3rdprtylibs\json.net.40\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.5.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -165,9 +175,17 @@
     <Reference Include="System.Security">
       <Name>System.Security</Name>
     </Reference>
+    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml">
       <Name>System.XML</Name>
     </Reference>
+    <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
@@ -1243,6 +1261,8 @@
     <None Include="..\..\..\keys\AyaNova.snk">
       <Link>AyaNova.snk</Link>
     </None>
+    <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="PartByWarehouseInventoryListSchema.xsc">
       <DependentUpon>PartByWarehouseInventoryListSchema.xsd</DependentUpon>
     </None>
diff --git a/source/ri/ri/Web.config b/source/ri/ri/Web.config
index 933239c..f163d44 100644
--- a/source/ri/ri/Web.config
+++ b/source/ri/ri/Web.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- For more information on how toconfigure your ASP.NET application, please visit
+<!-- For more information on how toconfigure your ASP.NET application,  please visit
   http://go.microsoft.com/fwlink/?LinkId=169433
   -->
 <configuration>
@@ -13,7 +13,7 @@
   </appSettings>
   <system.web>
     <globalization culture="auto:en-US" />
-    <httpRuntime requestValidationMode="2.0"/>
+    <httpRuntime requestValidationMode="2.0" />
     <compilation debug="true" targetFramework="4.0" />
     <authentication mode="Forms">
       <forms loginUrl="~/Account/Login" timeout="2880" />
@@ -36,7 +36,7 @@
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
-    <modules runAllManagedModulesForAllRequests="true" >
+    <modules runAllManagedModulesForAllRequests="true">
       <!--Following added to support reporting-->
       <add name="ASPxHttpHandlerModule" type="DevExpress.Web.ASPxClasses.ASPxHttpHandlerModule, DevExpress.Web.v10.2, Version=10.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     </modules>
diff --git a/source/ri/ri/config.txt b/source/ri/ri/config.txt
index dc9a76b..3949a45 100644
--- a/source/ri/ri/config.txt
+++ b/source/ri/ri/config.txt
@@ -5,7 +5,7 @@
 	<!-- VIRTUAL Use the test sql database -->
 	<ConnectionType>DataBase</ConnectionType>
 	<DataBaseType>MSSQL</DataBaseType>	
-    <DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=DevAyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>  	
+    <DataBaseConnectionString>Server=7DEVTEST-PC\SQLEXPRESS;initial catalog=AyaNova;User Id=sa; Password=abraxis;</DataBaseConnectionString>  	
 	
 	
 	<!-- Use CUSTOMER sql database 
diff --git a/source/ri/ri/ri.csproj b/source/ri/ri/ri.csproj
index 0d66daa..cb876f7 100644
--- a/source/ri/ri/ri.csproj
+++ b/source/ri/ri/ri.csproj
@@ -114,6 +114,7 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.Optimization">
       <HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
diff --git a/utils/AyaImport/app.config b/utils/AyaImport/app.config
index a85a9d1..47744df 100644
--- a/utils/AyaImport/app.config
+++ b/utils/AyaImport/app.config
@@ -1,3 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/utils/GeneratorService/app.config b/utils/GeneratorService/app.config
index a85a9d1..47744df 100644
--- a/utils/GeneratorService/app.config
+++ b/utils/GeneratorService/app.config
@@ -1,3 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>