diff --git a/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj b/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj
index 91c9a300..d0f5b54f 100644
--- a/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj
+++ b/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj
@@ -39,6 +39,18 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_56BCE057A062481D8C854220E8165A43"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6E1B9B1201C206482E813E63562592E5"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -81,12 +93,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_D00638E8107CF2A284517C9D22B5F2FD"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_EE232DF9B4BC45A4930DB0E636A09A53"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -100,7 +106,13 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D00638E8107CF2A284517C9D22B5F2FD"
+        "OwnerKey" = "8:_56BCE057A062481D8C854220E8165A43"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_6E1B9B1201C206482E813E63562592E5"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -234,6 +246,37 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6E1B9B1201C206482E813E63562592E5"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.Casa.MiCasa, Version=1.7.0.0, Culture=neutral, PublicKeyToken=35accfbe728f56c2, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_6E1B9B1201C206482E813E63562592E5"
+                    {
+                    "Name" = "8:Novell.Casa.MiCasa.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.Casa.MiCasa.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8D94F14CCA4C41669DA4EAE5E1DA9A5D"
             {
             "SourcePath" = "8:..\\..\\..\\..\\micasadk\\Release\\micasa.lib"
@@ -354,37 +397,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D00638E8107CF2A284517C9D22B5F2FD"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.Casa.MiCasa, Version=1.7.0.0, Culture=neutral, PublicKeyToken=35accfbe728f56c2, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_D00638E8107CF2A284517C9D22B5F2FD"
-                    {
-                    "Name" = "8:Novell.Casa.MiCasa.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Novell.Casa.MiCasa.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EE232DF9B4BC45A4930DB0E636A09A53"
             {
             "SourcePath" = "8:..\\..\\..\\..\\include\\sscs_string.h"
@@ -573,7 +585,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_384A908A3DE54B359C611011C2A2AA97"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Release\\cSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Debug\\cSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F3F9192858114846913E6271C812F8FA"
@@ -599,9 +611,37 @@
                 {
                 }
             }
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_56BCE057A062481D8C854220E8165A43"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\sharp\\Novell.Casa.MiCasa\\obj\\Debug\\Novell.Casa.MiCasa.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_1841C4B768B34541BC3EDA241449E509"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{7B56383F-6551-4BCD-81BB-A039BBECBD9C}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_718042C617DB414B91C69D1ACCD99A42"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Release\\CSharpSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Debug\\CSharpSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
diff --git a/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.suo b/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.suo
index 0dfeec8d..39ffdd3d 100644
Binary files a/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.suo and b/CASA/package/windows/vs_solutions/CASA64-msi/CASA-64-32.suo differ