diff --git a/c_gui/CASAManager.csproj.user b/c_gui/CASAManager.csproj.user
index c38f275e..ec410105 100644
--- a/c_gui/CASAManager.csproj.user
+++ b/c_gui/CASAManager.csproj.user
@@ -11,7 +11,7 @@
                     RemoteDebugEnabled = "false"
                     RemoteDebugMachine = ""
                     StartAction = "Project"
-                    StartArguments = "-debug"
+                    StartArguments = ""
                     StartPage = ""
                     StartProgram = ""
                     StartURL = ""
diff --git a/c_micasad/micasad.csproj b/c_micasad/micasad.csproj
index e9ddd470..a77dd058 100644
--- a/c_micasad/micasad.csproj
+++ b/c_micasad/micasad.csproj
@@ -300,7 +300,7 @@
                 />
                 <File
                     RelPath = "init\ProjectInstaller.cs"
-                    SubType = "Component"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
@@ -310,7 +310,7 @@
                 />
                 <File
                     RelPath = "init\WinSecretStoreClientService.cs"
-                    SubType = "Component"
+                    SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
diff --git a/c_test/c_sample/CSample.ncb b/c_test/c_sample/CSample.ncb
index f9bb186f..95f8d732 100644
Binary files a/c_test/c_sample/CSample.ncb and b/c_test/c_sample/CSample.ncb differ
diff --git a/c_test/c_sample/CSample.sln b/c_test/c_sample/CSample.sln
index fbd54801..3db809e9 100644
--- a/c_test/c_sample/CSample.sln
+++ b/c_test/c_sample/CSample.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NativeSample", "NativeSample.vcproj", "{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cSample", "..\..\..\casa2\c_test\c_sample\CSample.vcproj", "{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
diff --git a/c_test/c_sample/CSample.suo b/c_test/c_sample/CSample.suo
index 54e26f09..82f2b0ed 100644
Binary files a/c_test/c_sample/CSample.suo and b/c_test/c_sample/CSample.suo differ
diff --git a/c_test/c_sharp_sample/cSharpSample.sln b/c_test/c_sharp_sample/cSharpSample.sln
index d58cb444..b3eba243 100644
--- a/c_test/c_sharp_sample/cSharpSample.sln
+++ b/c_test/c_sharp_sample/cSharpSample.sln
@@ -3,6 +3,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cSharpSample", "cSharpSampl
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\..\c_sharp\NSSCSWrapper\Novell.CASA.miCASAWrapper.csproj", "{E21DD887-22F4-4935-9851-409715F663B0}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\c_micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -13,6 +21,14 @@ Global
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Debug.Build.0 = Debug|.NET
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Release.ActiveCfg = Release|.NET
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Release.Build.0 = Release|.NET
+		{E21DD887-22F4-4935-9851-409715F663B0}.Debug.ActiveCfg = Debug|.NET
+		{E21DD887-22F4-4935-9851-409715F663B0}.Debug.Build.0 = Debug|.NET
+		{E21DD887-22F4-4935-9851-409715F663B0}.Release.ActiveCfg = Release|.NET
+		{E21DD887-22F4-4935-9851-409715F663B0}.Release.Build.0 = Release|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Debug.ActiveCfg = Debug|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Debug.Build.0 = Debug|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.ActiveCfg = Release|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.Build.0 = Release|.NET
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/c_test/c_sharp_sample/cSharpSample.suo b/c_test/c_sharp_sample/cSharpSample.suo
index cd5db092..650099a5 100644
Binary files a/c_test/c_sharp_sample/cSharpSample.suo and b/c_test/c_sharp_sample/cSharpSample.suo differ
diff --git a/c_test/displayCache/DisplayMiCasa.ncb b/c_test/displayCache/DisplayMiCasa.ncb
index 00a86a99..d0e2b3e6 100644
Binary files a/c_test/displayCache/DisplayMiCasa.ncb and b/c_test/displayCache/DisplayMiCasa.ncb differ
diff --git a/c_test/displayCache/DisplayMiCasa.suo b/c_test/displayCache/DisplayMiCasa.suo
index 7e642f2a..e6077f85 100644
Binary files a/c_test/displayCache/DisplayMiCasa.suo and b/c_test/displayCache/DisplayMiCasa.suo differ
diff --git a/c_test/displayCache/sshtst.vcproj b/c_test/displayCache/sshtst.vcproj
index 4b682822..eacbdc94 100644
--- a/c_test/displayCache/sshtst.vcproj
+++ b/c_test/displayCache/sshtst.vcproj
@@ -40,7 +40,7 @@
 				AdditionalDependencies="micasa_mdd.lib odbc32.lib odbccp32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="D:\ccm\SSClient\SecretStoreClient_src\bin\w32\mdd"
+				AdditionalLibraryDirectories="D:\casaoutside\lib\w32"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				TargetMachine="1"/>
diff --git a/c_test/java_sample/java_sample.iws b/c_test/java_sample/java_sample.iws
index 75a558a2..bdb86463 100644
--- a/c_test/java_sample/java_sample.iws
+++ b/c_test/java_sample/java_sample.iws
@@ -12,28 +12,28 @@
   <component name="FileEditorManager">
     <history>
       <source-position-entry url="jar://D:/ccm/iMan202_FPx/iManager/tools/jdk/jre/lib/rt.jar!/java/lang/String.class" line="12" column="19" vertical-scroll-proportion="0.20307167" horizontal-scroll-proportion="0.15182649" />
-      <source-position-entry url="file://$PROJECT_DIR$/src/JavaSample.java" line="106" column="0" vertical-scroll-proportion="0.5633803" horizontal-scroll-proportion="0.0">
+      <source-position-entry url="file://D:/ccm/SSClient/SecretStoreClient_src/c_jwrapper/src/com/novell/casa/MiCasa.java" line="77" column="34" vertical-scroll-proportion="2.633803" horizontal-scroll-proportion="0.2713797" />
+      <source-position-entry url="file://$PROJECT_DIR$/src/JavaSample.java" line="114" column="29" vertical-scroll-proportion="0.5472837" horizontal-scroll-proportion="0.23147093">
+        <folding>
+          <element signature="imports" expanded="true" />
+        </folding>
+      </source-position-entry>
+    </history>
+    <open-files>
+      <source-position-entry url="file://$PROJECT_DIR$/src/JavaSample.java" line="114" column="29" vertical-scroll-proportion="0.5472837" horizontal-scroll-proportion="0.23147093" selected="true">
         <folding>
           <element signature="imports" expanded="true" />
         </folding>
       </source-position-entry>
       <source-position-entry url="file://D:/ccm/SSClient/SecretStoreClient_src/c_jwrapper/src/com/novell/casa/MiCasa.java" line="77" column="34" vertical-scroll-proportion="2.633803" horizontal-scroll-proportion="0.2713797" />
-    </history>
-    <open-files>
-      <source-position-entry url="file://$PROJECT_DIR$/src/JavaSample.java" line="106" column="0" vertical-scroll-proportion="0.5633803" horizontal-scroll-proportion="0.0">
-        <folding>
-          <element signature="imports" expanded="true" />
-        </folding>
-      </source-position-entry>
-      <source-position-entry url="file://D:/ccm/SSClient/SecretStoreClient_src/c_jwrapper/src/com/novell/casa/MiCasa.java" line="77" column="34" vertical-scroll-proportion="2.633803" horizontal-scroll-proportion="0.2713797" selected="true" />
     </open-files>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1288" height="1002" extended-state="0" />
-    <editor active="false" />
+    <frame x="-4" y="-4" width="1288" height="1002" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.36259976" order="2" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.36259976" order="2" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32930845" order="7" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
diff --git a/c_test/sdk_sshtst/sshtst.c b/c_test/sdk_sshtst/sshtst.c
index ff6dbb57..3e7ef925 100644
--- a/c_test/sdk_sshtst/sshtst.c
+++ b/c_test/sdk_sshtst/sshtst.c
@@ -619,6 +619,7 @@ int	main
 
 		strcpy((char*)credential.username, "AppUsername");
 		strcpy((char*)credential.password, "AppPassword");
+		credential.unFlags = USERNAME_TYPE_NDS_FDN_F;
 
 		// sets the secret specific to the app
 		rcode = miCASASetCredential(            
@@ -633,12 +634,12 @@ int	main
 
 		memset(&credential, 0, sizeof(SSCS_BASIC_CREDENTIAL));
 
-		credential.unFlags = USERNAME_TYPE_NDS_DN_F;
+		credential.unFlags = USERNAME_TYPE_NDS_FDN_F;
 		// gets the sharedcredential
 		rcode = miCASAGetCredential(            
 			0,
 			&appSecretId,		//char			*	appSecretID,			// IN
-			&sharedSecretId, 	//char			*	sharedSecretID,			// Optional IN
+			NULL, //&sharedSecretId, 	//char			*	sharedSecretID,			// Optional IN
 			0,					//int				*	credentialType,			// IN/OUT
 			&credential,		//void				*	credential,				// OUT
 			NULL				//SSCS_EXT_T		*	ext						// Reserved
diff --git a/c_test/sdk_sshtst/sshtst.ncb b/c_test/sdk_sshtst/sshtst.ncb
index e0a2bd63..d3938ebc 100644
Binary files a/c_test/sdk_sshtst/sshtst.ncb and b/c_test/sdk_sshtst/sshtst.ncb differ
diff --git a/c_test/sdk_sshtst/sshtst.suo b/c_test/sdk_sshtst/sshtst.suo
index 524ead02..5b4666ac 100644
Binary files a/c_test/sdk_sshtst/sshtst.suo and b/c_test/sdk_sshtst/sshtst.suo differ
diff --git a/c_test/sdk_sshtst/sshtst.vcproj b/c_test/sdk_sshtst/sshtst.vcproj
index 6cf52a6f..26c6f229 100644
--- a/c_test/sdk_sshtst/sshtst.vcproj
+++ b/c_test/sdk_sshtst/sshtst.vcproj
@@ -43,7 +43,7 @@
 				OutputFile=".\Debug/sshtst.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="D:\ccm\SSClient\SecretStoreClient_src\bin\w32\mdd"
+				AdditionalLibraryDirectories="D:\casaoutside\lib\w32"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/sshtst.pdb"
 				SubSystem="1"
diff --git a/vs_solutions/CASAInstall/CASA.ncb b/vs_solutions/CASAInstall/CASA.ncb
index 623bb12c..42b4e488 100644
Binary files a/vs_solutions/CASAInstall/CASA.ncb and b/vs_solutions/CASAInstall/CASA.ncb differ
diff --git a/vs_solutions/CASAInstall/CASA.sln b/vs_solutions/CASAInstall/CASA.sln
index 70c63017..d5b2bb7a 100644
--- a/vs_solutions/CASAInstall/CASA.sln
+++ b/vs_solutions/CASAInstall/CASA.sln
@@ -43,10 +43,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DisplayCache", "..\..\c_test\displayCache\displaycache.vcproj", "{534B797C-48CF-45F9-9591-654ABA0B4934}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CASAManager", "..\..\c_gui\CASAManager.csproj", "{A1A805D0-B400-4D11-A772-348CE13F1046}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
@@ -113,10 +109,6 @@ Global
 		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Debug.Build.0 = Debug|.NET
 		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.ActiveCfg = Release|.NET
 		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.Build.0 = Release|.NET
-		{534B797C-48CF-45F9-9591-654ABA0B4934}.Debug.ActiveCfg = Debug|Win32
-		{534B797C-48CF-45F9-9591-654ABA0B4934}.Debug.Build.0 = Debug|Win32
-		{534B797C-48CF-45F9-9591-654ABA0B4934}.Release.ActiveCfg = Release|Win32
-		{534B797C-48CF-45F9-9591-654ABA0B4934}.Release.Build.0 = Release|Win32
 		{A1A805D0-B400-4D11-A772-348CE13F1046}.Debug.ActiveCfg = Debug|.NET
 		{A1A805D0-B400-4D11-A772-348CE13F1046}.Debug.Build.0 = Debug|.NET
 		{A1A805D0-B400-4D11-A772-348CE13F1046}.Release.ActiveCfg = Release|.NET
diff --git a/vs_solutions/CASAInstall/CASA.suo b/vs_solutions/CASAInstall/CASA.suo
index fe473bd0..1b4fb0f2 100644
Binary files a/vs_solutions/CASAInstall/CASA.suo and b/vs_solutions/CASAInstall/CASA.suo differ
diff --git a/vs_solutions/CASAInstall/CASA.vdproj b/vs_solutions/CASAInstall/CASA.vdproj
index 9eef95dd..76974b71 100644
--- a/vs_solutions/CASAInstall/CASA.vdproj
+++ b/vs_solutions/CASAInstall/CASA.vdproj
@@ -21,24 +21,30 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_3E127CE6F3104E9F9DF937C53DDD15B4"
+        "MsmKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_93A5D480D91747B086FD13789A12978B"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_B7B1DB5DD09B4D36B2A8C353C94A7297"
         "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_3E127CE6F3104E9F9DF937C53DDD15B4"
+        "MsmKey" = "8:_B7B1DB5DD09B4D36B2A8C353C94A7297"
         "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_D1641051214046F78EDF37DC13C414ED"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -134,6 +140,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_93A5D480D91747B086FD13789A12978B"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\images\\CASA.bmp"
+            "TargetName" = "8:CASA.bmp"
+            "Tag" = "8:"
+            "Folder" = "8:_E8900D5F0BD44DC0BB0BEFDF7C43B30C"
+            "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:TRUE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_EF467E7BEF8E4109BAD7E2FE47508D13"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\CASAicons.ico"
@@ -224,13 +250,13 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:CASA"
-        "ProductCode" = "8:{79F3AC2D-8684-4E87-83AC-4228F3494A9C}"
-        "PackageCode" = "8:{86027C8B-28FF-41F6-95E7-5F8A6DD77A1E}"
+        "ProductCode" = "8:{57440238-DFAE-411E-906D-B73B7183B07F}"
+        "PackageCode" = "8:{EED56817-5E66-4562-AECB-DB0A43716A8D}"
         "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
-        "ProductVersion" = "8:1.5.0"
+        "ProductVersion" = "8:1.5.132"
         "Manufacturer" = "8:Novell"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -240,7 +266,7 @@
         "Keywords" = "8:"
         "ARPCOMMENTS" = "8:"
         "ARPURLINFOABOUT" = "8:"
-        "ARPPRODUCTICON" = "8:"
+        "ARPPRODUCTICON" = "8:_EF467E7BEF8E4109BAD7E2FE47508D13"
         "ARPIconIndex" = "3:0"
         "SearchPath" = "8:"
         "UseSystemSearchPath" = "11:TRUE"
@@ -366,7 +392,8 @@
                             "Type" = "3:8"
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
-                            "Setting" = "3:1"
+                            "Setting" = "3:2"
+                            "Value" = "8:_93A5D480D91747B086FD13789A12978B"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "UpdateText"
@@ -410,7 +437,8 @@
                             "Type" = "3:8"
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
-                            "Setting" = "3:1"
+                            "Setting" = "3:2"
+                            "Value" = "8:_93A5D480D91747B086FD13789A12978B"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "ShowProgress"
@@ -561,7 +589,8 @@
                             "Type" = "3:8"
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
-                            "Setting" = "3:1"
+                            "Setting" = "3:2"
+                            "Value" = "8:_93A5D480D91747B086FD13789A12978B"
                             "UsePlugInResources" = "11:TRUE"
                             }
                         }
@@ -583,7 +612,8 @@
                             "Type" = "3:8"
                             "ContextData" = "8:Bitmap"
                             "Attributes" = "3:4"
-                            "Setting" = "3:1"
+                            "Setting" = "3:2"
+                            "Value" = "8:_93A5D480D91747B086FD13789A12978B"
                             "UsePlugInResources" = "11:TRUE"
                             }
                             "CopyrightWarning"
@@ -700,7 +730,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_3E127CE6F3104E9F9DF937C53DDD15B4"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_B7B1DB5DD09B4D36B2A8C353C94A7297"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
diff --git a/vs_solutions/CASAManager/CASAManager.sln b/vs_solutions/CASAManager/CASAManager.sln
index 91cc0296..eea11533 100644
--- a/vs_solutions/CASAManager/CASAManager.sln
+++ b/vs_solutions/CASAManager/CASAManager.sln
@@ -23,6 +23,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cSharpSample", "..\..\c_tes
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "..\test\ConsoleApplication1\ConsoleApplication1.csproj", "{2442C9C3-A1BF-4A35-A540-640219FDB6BD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c-sharp-net-credential", "..\..\ClientPasswordManager\c-sharp-net-credential\c-sharp-net-credential.csproj", "{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -53,6 +61,14 @@ Global
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Debug.Build.0 = Debug|.NET
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Release.ActiveCfg = Release|.NET
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Release.Build.0 = Release|.NET
+		{2442C9C3-A1BF-4A35-A540-640219FDB6BD}.Debug.ActiveCfg = Debug|.NET
+		{2442C9C3-A1BF-4A35-A540-640219FDB6BD}.Debug.Build.0 = Debug|.NET
+		{2442C9C3-A1BF-4A35-A540-640219FDB6BD}.Release.ActiveCfg = Release|.NET
+		{2442C9C3-A1BF-4A35-A540-640219FDB6BD}.Release.Build.0 = Release|.NET
+		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Debug.ActiveCfg = Debug|.NET
+		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Debug.Build.0 = Debug|.NET
+		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Release.ActiveCfg = Release|.NET
+		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Release.Build.0 = Release|.NET
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/vs_solutions/CASAManager/CASAManager.suo b/vs_solutions/CASAManager/CASAManager.suo
index 0e22cc99..df30ed7a 100644
Binary files a/vs_solutions/CASAManager/CASAManager.suo and b/vs_solutions/CASAManager/CASAManager.suo differ
diff --git a/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj b/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj
index cd6e039d..8fc88a32 100644
--- a/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj
+++ b/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj
@@ -13,30 +13,6 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
-        "Entry"
-        {
-        "MsmKey" = "8:_0A0E6BB5708968B0168B23C816FE7230"
-        "OwnerKey" = "8:_34CB0B4EB83EDB17DC91043259361A0A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0A0E6BB5708968B0168B23C816FE7230"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0A0E6BB5708968B0168B23C816FE7230"
-        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0A0E6BB5708968B0168B23C816FE7230"
-        "OwnerKey" = "8:_25D76038ADEEC84E1F1910BF3ED22C66"
-        "MsmSig" = "8:_UNDEFINED"
-        }
         "Entry"
         {
         "MsmKey" = "8:_24DA7E000C1645438F67455260F5A201"
@@ -45,37 +21,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_25D76038ADEEC84E1F1910BF3ED22C66"
-        "OwnerKey" = "8:_34CB0B4EB83EDB17DC91043259361A0A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_25D76038ADEEC84E1F1910BF3ED22C66"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_25D76038ADEEC84E1F1910BF3ED22C66"
-        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_34CB0B4EB83EDB17DC91043259361A0A"
-        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_34CB0B4EB83EDB17DC91043259361A0A"
-        "OwnerKey" = "8:_54D95E393BAC37AD264C26D3384AC788"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_34CB0B4EB83EDB17DC91043259361A0A"
+        "MsmKey" = "8:_376F083CE30B3827C9A328D97A114E5C"
         "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -93,14 +39,44 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_54D95E393BAC37AD264C26D3384AC788"
+        "MsmKey" = "8:_587E42A280590E3B8A25FBB49A0CD2BF"
+        "OwnerKey" = "8:_6EAE419219BE450D838A3D7F86D148C2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_657B6A84C536629F95C8332281A13B80"
+        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_657B6A84C536629F95C8332281A13B80"
+        "OwnerKey" = "8:_376F083CE30B3827C9A328D97A114E5C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_657B6A84C536629F95C8332281A13B80"
         "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_587E42A280590E3B8A25FBB49A0CD2BF"
-        "OwnerKey" = "8:_6EAE419219BE450D838A3D7F86D148C2"
+        "MsmKey" = "8:_6872CFE74A9B6C11A520EA631FC1E01C"
+        "OwnerKey" = "8:_657B6A84C536629F95C8332281A13B80"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6872CFE74A9B6C11A520EA631FC1E01C"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6872CFE74A9B6C11A520EA631FC1E01C"
+        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -129,6 +105,54 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_376F083CE30B3827C9A328D97A114E5C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_587E42A280590E3B8A25FBB49A0CD2BF"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_6EAE419219BE450D838A3D7F86D148C2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_6872CFE74A9B6C11A520EA631FC1E01C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_C760C1E6578EC5DA1B07D4180508DB59"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A48A036187C640B4860EB37511A2C834"
+        "OwnerKey" = "8:_657B6A84C536629F95C8332281A13B80"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_A7A23CA536234B8BAE08CA9528EC8F93"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -141,8 +165,26 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_BFB5523F92C62717D5FFB02E609341F7"
-        "OwnerKey" = "8:_EC3F59F7D1BC42AAAE860947653109A5"
+        "MsmKey" = "8:_C760C1E6578EC5DA1B07D4180508DB59"
+        "OwnerKey" = "8:_657B6A84C536629F95C8332281A13B80"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C760C1E6578EC5DA1B07D4180508DB59"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C760C1E6578EC5DA1B07D4180508DB59"
+        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C760C1E6578EC5DA1B07D4180508DB59"
+        "OwnerKey" = "8:_6872CFE74A9B6C11A520EA631FC1E01C"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -153,66 +195,12 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_68A9A310F574493BB0B61E4DDFDDE02B"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_54D95E393BAC37AD264C26D3384AC788"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_587E42A280590E3B8A25FBB49A0CD2BF"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_6EAE419219BE450D838A3D7F86D148C2"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_25D76038ADEEC84E1F1910BF3ED22C66"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_0A0E6BB5708968B0168B23C816FE7230"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_E48F882A17AC431290F1D78EF0E405DC"
-        "OwnerKey" = "8:_34CB0B4EB83EDB17DC91043259361A0A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_EA4BDF28758448708F769C91585DF987"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_EC3F59F7D1BC42AAAE860947653109A5"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_F5BD529C0C0947A0991C096DE3714141"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -266,37 +254,6 @@
         }
         "File"
         {
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_0A0E6BB5708968B0168B23C816FE7230"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.0.0.38162, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_0A0E6BB5708968B0168B23C816FE7230"
-                    {
-                    "Name" = "8:AppModule.InterProcessComm.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:AppModule.InterProcessComm.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94"
-            "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:"
-            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_24DA7E000C1645438F67455260F5A201"
             {
             "SourcePath" = "8:..\\..\\include\\micasa_mgmd.h"
@@ -317,54 +274,23 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_25D76038ADEEC84E1F1910BF3ED22C66"
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_376F083CE30B3827C9A328D97A114E5C"
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.0.1.38162, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.0.2121.31825, Culture=neutral"
                 "ScatterAssemblies"
                 {
-                    "_25D76038ADEEC84E1F1910BF3ED22C66"
+                    "_376F083CE30B3827C9A328D97A114E5C"
                     {
-                    "Name" = "8:AppModule.NamedPipes.dll"
+                    "Name" = "8:Novell.CASA.miCASAWrapper.dll"
                     "Attributes" = "3:512"
                     }
                 }
-            "SourcePath" = "8:AppModule.NamedPipes.dll"
+            "SourcePath" = "8:Novell.CASA.miCASAWrapper.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94"
-            "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:"
-            }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_34CB0B4EB83EDB17DC91043259361A0A"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.0.2096.27820, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_34CB0B4EB83EDB17DC91043259361A0A"
-                    {
-                    "Name" = "8:Novell.CASA.Common.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Novell.CASA.Common.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -399,37 +325,6 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_54D95E393BAC37AD264C26D3384AC788"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.0.2096.27820, Culture=neutral"
-                "ScatterAssemblies"
-                {
-                    "_54D95E393BAC37AD264C26D3384AC788"
-                    {
-                    "Name" = "8:Novell.CASA.miCASAWrapper.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Novell.CASA.miCASAWrapper.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:"
-            }
             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_587E42A280590E3B8A25FBB49A0CD2BF"
             {
             "AssemblyRegister" = "3:1"
@@ -461,6 +356,68 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_657B6A84C536629F95C8332281A13B80"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.0.2121.31824, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_657B6A84C536629F95C8332281A13B80"
+                    {
+                    "Name" = "8:Novell.CASA.Common.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.CASA.Common.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94"
+            "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:"
+            }
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_6872CFE74A9B6C11A520EA631FC1E01C"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.0.1.25724, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_6872CFE74A9B6C11A520EA631FC1E01C"
+                    {
+                    "Name" = "8:AppModule.NamedPipes.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.NamedPipes.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_9630BD80B06842BB9DE27916F038665C"
             {
             "SourcePath" = "8:..\\..\\include\\sscs_utf8.h"
@@ -521,6 +478,37 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_C760C1E6578EC5DA1B07D4180508DB59"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.0.0.25724, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_C760C1E6578EC5DA1B07D4180508DB59"
+                    {
+                    "Name" = "8:AppModule.InterProcessComm.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.InterProcessComm.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_E1BD8C4853644B74A9F09611F6EC8BD8"
             {
             "SourcePath" = "8:..\\..\\c_test\\java_sample\\src\\JavaSample.java"
@@ -717,7 +705,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_E48F882A17AC431290F1D78EF0E405DC"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_A48A036187C640B4860EB37511A2C834"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -911,34 +899,6 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_EC3F59F7D1BC42AAAE860947653109A5"
-            {
-            "SourcePath" = "8:..\\..\\c_test\\displayCache\\Release\\DisplayCache.exe"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_CE3056EFDBEF4C8A9C2DBC34DBC54197"
-            "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:{534B797C-48CF-45F9-9591-654ABA0B4934}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
         }
         "Registry"
         {
diff --git a/vs_solutions/miCASA-msm/miCASA-msm.vdproj b/vs_solutions/miCASA-msm/miCASA-msm.vdproj
index ccd854aa..a316632f 100644
--- a/vs_solutions/miCASA-msm/miCASA-msm.vdproj
+++ b/vs_solutions/miCASA-msm/miCASA-msm.vdproj
@@ -33,6 +33,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_03CB5353398E4ABCAEE43E37DFCF1D9F"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_0453CF261E6BA843B51FC502E70FF7FC"
         "OwnerKey" = "8:_0CF75D920850F8D1BCF2BDA55935489A"
         "MsmSig" = "8:_UNDEFINED"
@@ -81,6 +87,90 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_8039E843D06434022A08C6B96797B187"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_F9EE246A22C88B0E40149A5C39612EE3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_A47EDC5C7F17B89FA528AC6AF5E27356"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_240CCF597BBD08EDB302CC1681F4D4D0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_E5A85B0EC9EB553B9E0648781BD250E3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_F49D94B7153A1DD540BF6CA5C348B06F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_0453CF261E6BA843B51FC502E70FF7FC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_58D5C694323CA4E1C71E2FD5E4F2CD6F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_0CF75D920850F8D1BCF2BDA55935489A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_41D0728D857296857EEBAE2A2F71F38C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_036E4CAC185367DD377EA8CBE06E1841"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "OwnerKey" = "8:_29EBB88ADB672423B03C04F3E8128BF0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_1A4CE567CBB9469C9EAF7D6B15A1C2D6"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -105,12 +195,24 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_2562AD84E5AA4718821B55D9C71C9238"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_29EBB88ADB672423B03C04F3E8128BF0"
         "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_2AB5DFE5CB52481893AD07B20DBCEB3A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_340AA9E468AF4E0DB22EEF2862558201"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -141,6 +243,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_469EFF3E20DC4443866D8ADF279C95AB"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_52BF328273034BF199E0FBBB91655492"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -189,13 +297,25 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_663C0489E7CE41A330B93C594A633DCF"
-        "OwnerKey" = "8:_A1FB989F0AB943DA8EE0A3AF942803BD"
+        "MsmKey" = "8:_70FA2C87CE5A4D538B45891E165DF73A"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_70FA2C87CE5A4D538B45891E165DF73A"
+        "MsmKey" = "8:_73DEC168970C49708048B56E260BD164"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7673A20B83CD47F5A64DE855D8D20D19"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_7FA135531FA94C1A94B168DFF6DCF3D6"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -213,90 +333,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_8039E843D06434022A08C6B96797B187"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_F9EE246A22C88B0E40149A5C39612EE3"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_A47EDC5C7F17B89FA528AC6AF5E27356"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_240CCF597BBD08EDB302CC1681F4D4D0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_E5A85B0EC9EB553B9E0648781BD250E3"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_F49D94B7153A1DD540BF6CA5C348B06F"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_0453CF261E6BA843B51FC502E70FF7FC"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_58D5C694323CA4E1C71E2FD5E4F2CD6F"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_0CF75D920850F8D1BCF2BDA55935489A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_41D0728D857296857EEBAE2A2F71F38C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_036E4CAC185367DD377EA8CBE06E1841"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_818607464F724807B0E47300898BB243"
-        "OwnerKey" = "8:_29EBB88ADB672423B03C04F3E8128BF0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_82773D8C158649D4841D40F4E4203F35"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -315,7 +351,7 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_A1FB989F0AB943DA8EE0A3AF942803BD"
+        "MsmKey" = "8:_9F02EC19780C4A55B1BA87EF07363894"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -345,6 +381,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_AB845EA4C04B447E87FE0585398C75AE"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_B518A6FBE9E147398154C99B22D364B6"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -357,6 +399,30 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_B62020EEF7C24F289FD35FEECBB90645"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC926AC5EE2C4920B2395B7DE6C4DAA2"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_D0E27E85B2394070991BB562B86F1985"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_D7337DEE1AB9400EA50365074821F437"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_D8BE4B1E9CB842079C5A337A97573B8F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -381,6 +447,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_E8524E7375714B688C81B1F9729B3C18"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_EDB1B20B62DA4C08AF276EC0816776C3"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -435,6 +507,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_FBE629333B844380AF883D43920855F4"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_FFD9E1013ED54F3F9FDC07B341BB6432"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -575,6 +653,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_03CB5353398E4ABCAEE43E37DFCF1D9F"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\h1_help_zcc.gif"
+            "TargetName" = "8:h1_help_zcc.gif"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_0453CF261E6BA843B51FC502E70FF7FC"
             {
             "AssemblyRegister" = "3:1"
@@ -630,7 +728,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.0.2112.25015, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.0.2132.25719, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_0CF75D920850F8D1BCF2BDA55935489A"
@@ -728,6 +826,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_2562AD84E5AA4718821B55D9C71C9238"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\CASAMasterPasswordAuthentication.htm"
+            "TargetName" = "8:CASAMasterPasswordAuthentication.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_29EBB88ADB672423B03C04F3E8128BF0"
             {
             "AssemblyRegister" = "3:1"
@@ -759,6 +877,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_2AB5DFE5CB52481893AD07B20DBCEB3A"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\legal_notices_en.html"
+            "TargetName" = "8:legal_notices_en.html"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_340AA9E468AF4E0DB22EEF2862558201"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\firefox-logo.png"
@@ -803,7 +941,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.0.2112.25015, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.0.2132.25720, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_41D0728D857296857EEBAE2A2F71F38C"
@@ -850,6 +988,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_469EFF3E20DC4443866D8ADF279C95AB"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\DestroyingSecrets.htm"
+            "TargetName" = "8:DestroyingSecrets.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_58BC0A46983941A1A7379649B5647B5C"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\CASAiconsLocked.ico"
@@ -921,12 +1079,12 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_663C0489E7CE41A330B93C594A633DCF"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_70FA2C87CE5A4D538B45891E165DF73A"
             {
-            "SourcePath" = "8:micasa.dll"
-            "TargetName" = "8:micasa.dll"
+            "SourcePath" = "8:..\\..\\c_gui\\images\\casa-1.5.glade"
+            "TargetName" = "8:casa-1.5.glade"
             "Tag" = "8:"
-            "Folder" = "8:_1A41C925C695498E975E522C6E5A77F9"
+            "Folder" = "8:_162CCA8002474F63A499FB7BA61C66B4"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -938,15 +1096,55 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_70FA2C87CE5A4D538B45891E165DF73A"
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_73DEC168970C49708048B56E260BD164"
             {
-            "SourcePath" = "8:..\\..\\c_gui\\images\\casa-1.5.glade"
-            "TargetName" = "8:casa-1.5.glade"
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\hf_style.css"
+            "TargetName" = "8:hf_style.css"
             "Tag" = "8:"
-            "Folder" = "8:_162CCA8002474F63A499FB7BA61C66B4"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_7673A20B83CD47F5A64DE855D8D20D19"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\Preferences.htm"
+            "TargetName" = "8:Preferences.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_7FA135531FA94C1A94B168DFF6DCF3D6"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\Contents.htm"
+            "TargetName" = "8:Contents.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -1052,6 +1250,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_9F02EC19780C4A55B1BA87EF07363894"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\LinkingSecrets.htm"
+            "TargetName" = "8:LinkingSecrets.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_A47EDC5C7F17B89FA528AC6AF5E27356"
             {
             "AssemblyRegister" = "3:1"
@@ -1103,6 +1321,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_AB845EA4C04B447E87FE0585398C75AE"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\UnlockSecrets.htm"
+            "TargetName" = "8:UnlockSecrets.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_B518A6FBE9E147398154C99B22D364B6"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\keyring-logo.png"
@@ -1143,6 +1381,86 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_B62020EEF7C24F289FD35FEECBB90645"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\ViewSecrets.htm"
+            "TargetName" = "8:ViewSecrets.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_CC926AC5EE2C4920B2395B7DE6C4DAA2"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\help_zcc_bg.gif"
+            "TargetName" = "8:help_zcc_bg.gif"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_D0E27E85B2394070991BB562B86F1985"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\AddNewSecrets.htm"
+            "TargetName" = "8:AddNewSecrets.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_D7337DEE1AB9400EA50365074821F437"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\Persistent Storage.htm"
+            "TargetName" = "8:Persistent Storage.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_D8BE4B1E9CB842079C5A337A97573B8F"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\CASA_32.png"
@@ -1214,6 +1532,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_E8524E7375714B688C81B1F9729B3C18"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\EditingSecrets.html"
+            "TargetName" = "8:EditingSecrets.html"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_EDB1B20B62DA4C08AF276EC0816776C3"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\kwallet-logo.png"
@@ -1296,6 +1634,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_FBE629333B844380AF883D43920855F4"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\LinkA.gif"
+            "TargetName" = "8:LinkA.gif"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_FFD9E1013ED54F3F9FDC07B341BB6432"
             {
             "SourcePath" = "8:C:\\WINDOWS\\system32\\regsvc.dll"
@@ -1385,6 +1743,28 @@
                             "Property" = "8:_115A38F3DC8940EF9053628253BCFD3A"
                                 "Folders"
                                 {
+                                    "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_1236C5CCF7794A1F9F9629930BC2392B"
+                                    {
+                                    "Name" = "8:help"
+                                    "AlwaysCreate" = "11:FALSE"
+                                    "Condition" = "8:"
+                                    "Transitive" = "11:FALSE"
+                                    "Property" = "8:_54C5D791512146E09DD6A64BD60E9DCE"
+                                        "Folders"
+                                        {
+                                            "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+                                            {
+                                            "Name" = "8:en"
+                                            "AlwaysCreate" = "11:FALSE"
+                                            "Condition" = "8:"
+                                            "Transitive" = "11:FALSE"
+                                            "Property" = "8:_77496B123CE94C9FA9B293C3D979BB35"
+                                                "Folders"
+                                                {
+                                                }
+                                            }
+                                        }
+                                    }
                                     "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_162CCA8002474F63A499FB7BA61C66B4"
                                     {
                                     "Name" = "8:images"
@@ -1441,7 +1821,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_818607464F724807B0E47300898BB243"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_17A893E0737E4EA38201050E23256EBD"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -1551,34 +1931,6 @@
                 {
                 }
             }
-            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_A1FB989F0AB943DA8EE0A3AF942803BD"
-            {
-            "SourcePath" = "8:..\\..\\c_test\\displayCache\\Release\\DisplayCache.exe"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_1A41C925C695498E975E522C6E5A77F9"
-            "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:{534B797C-48CF-45F9-9591-654ABA0B4934}"
-            "ShowKeyOutput" = "11:TRUE"
-                "ExcludeFilters"
-                {
-                }
-            }
         }
         "Registry"
         {
diff --git a/vs_solutions/micasad/micasad.suo b/vs_solutions/micasad/micasad.suo
index ca3c5cc8..d423f2c1 100644
Binary files a/vs_solutions/micasad/micasad.suo and b/vs_solutions/micasad/micasad.suo differ