Index: LamsSharePointIntegration/LamsSharePointIntegration/LamsSharePointIntegration.csproj
===================================================================
diff -u -r5f3849898f9d77c022066dc244265c806586f91b -r14bb2a439a94b124ced65cec1bb2b8910c5fec63
--- LamsSharePointIntegration/LamsSharePointIntegration/LamsSharePointIntegration.csproj	(.../LamsSharePointIntegration.csproj)	(revision 5f3849898f9d77c022066dc244265c806586f91b)
+++ LamsSharePointIntegration/LamsSharePointIntegration/LamsSharePointIntegration.csproj	(.../LamsSharePointIntegration.csproj)	(revision 14bb2a439a94b124ced65cec1bb2b8910c5fec63)
@@ -50,7 +50,6 @@
     <Compile Include="Src\LAMSLessonListEventHandler.cs" />
     <Compile Include="Src\LAMSSecurityUtil.cs">
     </Compile>
-    <None Include="Src\LAMSUserInformationHandler.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="TEMPLATE\FEATURES\LamsSharePointIntegration\elements.xml" />
@@ -69,12 +68,6 @@
     </Content>
     <Content Include="TEMPLATE\FEATURES\LamsSharePointIntegration\LessonsList\schema.xml" />
     <Content Include="TEMPLATE\FEATURES\LamsSharePointIntegration\ListTemplates\LessonsList.xml" />
-    <Content Include="TEMPLATE\FEATURES\LamsSharePointIntegration\PageTemplates\LAMSLearning.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
-    <Content Include="TEMPLATE\FEATURES\LamsSharePointIntegration\PageTemplates\LAMSTeaching.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
     <Content Include="TEMPLATE\IMAGES\LamsSharePointIntegration\favicon.ico" />
     <Content Include="TEMPLATE\IMAGES\LamsSharePointIntegration\lams_logo.gif" />
     <Content Include="TEMPLATE\IMAGES\LamsSharePointIntegration\treeicons\base.gif" />
@@ -93,9 +86,6 @@
     <Content Include="TEMPLATE\LAYOUTS\LamsSharePointIntegration\LAMSIntegrationSettings.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="TEMPLATE\LAYOUTS\LamsSharePointIntegration\LAMSLandingRedirect.aspx">
-      <SubType>ASPXCodeBehind</SubType>
-    </Content>
     <Content Include="Solution\manifest.xml" />
     <Content Include="TEMPLATE\LAYOUTS\LamsSharePointIntegration\LAMSOpenPopup.aspx">
       <SubType>ASPXCodeBehind</SubType>
@@ -116,7 +106,6 @@
     <None Include="Package\InstallSolutionPackage.cmd" />
     <None Include="TEMPLATE\LAYOUTS\LamsSharePointIntegration\LAMSAjaxServletRequester.ashx">
     </None>
-    <None Include="TEMPLATE\LAYOUTS\LamsSharePointIntegration\LAMSUserInformation.ashx" />
     <None Include="Solution\Cab.ddf" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -129,6 +118,9 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>cd $(ProjectDir)
+cd Package
+CreateSolutionPackage.cmd
+cd ..
 Install.bat
 </PostBuildEvent>
   </PropertyGroup>
Index: LamsSharePointIntegration/LamsSharePointIntegration/Package/LamsSharePointIntegration.wsp
===================================================================
diff -u -r5f3849898f9d77c022066dc244265c806586f91b -r14bb2a439a94b124ced65cec1bb2b8910c5fec63
Binary files differ
Index: LamsSharePointIntegration/LamsSharePointIntegration/Package/RemoveSolution.cmd
===================================================================
diff -u
--- LamsSharePointIntegration/LamsSharePointIntegration/Package/RemoveSolution.cmd	(revision 0)
+++ LamsSharePointIntegration/LamsSharePointIntegration/Package/RemoveSolution.cmd	(revision 14bb2a439a94b124ced65cec1bb2b8910c5fec63)
@@ -0,0 +1,11 @@
+
+@SET STSADM="c:\program files\common files\microsoft shared\web server extensions\12\bin\stsadm.exe" 
+
+Echo Removing LamsSharePointIntegration solution.
+
+%STSADM% -o retractsolution -name LamsSharePointIntegration.wsp -immediate
+%STSADM% -o execadmsvcjobs
+%STSADM% -o deletesolution -name LamsSharePointIntegration.wsp -override
+%STSADM% -o execadmsvcjobs
+IISRESET
+:end
\ No newline at end of file
Index: LamsSharePointIntegration/LamsSharePointIntegration/Src/LAMSLanguageMap.cs
===================================================================
diff -u -r5f3849898f9d77c022066dc244265c806586f91b -r14bb2a439a94b124ced65cec1bb2b8910c5fec63
--- LamsSharePointIntegration/LamsSharePointIntegration/Src/LAMSLanguageMap.cs	(.../LAMSLanguageMap.cs)	(revision 5f3849898f9d77c022066dc244265c806586f91b)
+++ LamsSharePointIntegration/LamsSharePointIntegration/Src/LAMSLanguageMap.cs	(.../LAMSLanguageMap.cs)	(revision 14bb2a439a94b124ced65cec1bb2b8910c5fec63)
@@ -153,7 +153,7 @@
                     ret[0] = "pl";
                     ret[1] = "PL";
                     return ret;
-                    break;
+ 
                 case RUSSIAN:
                     ret[0] = "ru";
                     ret[1] = "RU";
@@ -163,7 +163,7 @@
                     ret[0] = "es";
                     ret[1] = "ES";
                     return ret;
-                    break;
+
                 case SWEDISH:
                     ret[0] = "sv";
                     ret[1] = "SE";
Index: LamsSharePointIntegration/LamsSharePointIntegration/Src/LAMSLessonListEventHandler.cs
===================================================================
diff -u -r5f3849898f9d77c022066dc244265c806586f91b -r14bb2a439a94b124ced65cec1bb2b8910c5fec63
--- LamsSharePointIntegration/LamsSharePointIntegration/Src/LAMSLessonListEventHandler.cs	(.../LAMSLessonListEventHandler.cs)	(revision 5f3849898f9d77c022066dc244265c806586f91b)
+++ LamsSharePointIntegration/LamsSharePointIntegration/Src/LAMSLessonListEventHandler.cs	(.../LAMSLessonListEventHandler.cs)	(revision 14bb2a439a94b124ced65cec1bb2b8910c5fec63)
@@ -75,7 +75,7 @@
             {
                 lessonId = LAMSSecurityUtil.startLesson(user, siteWeb, sequenceId, title, description, "start");
             }
-            catch (System.Net.WebException e)
+            catch (System.Net.WebException)
             {
                 properties.ErrorMessage = "Request to LAMS server to start lesson failed. Please Contact System Administrator";
                 properties.Cancel = true;
Index: LamsSharePointIntegration/LamsSharePointIntegration/setup.inf
===================================================================
diff -u -r5f3849898f9d77c022066dc244265c806586f91b -r14bb2a439a94b124ced65cec1bb2b8910c5fec63
--- LamsSharePointIntegration/LamsSharePointIntegration/setup.inf	(.../setup.inf)	(revision 5f3849898f9d77c022066dc244265c806586f91b)
+++ LamsSharePointIntegration/LamsSharePointIntegration/setup.inf	(.../setup.inf)	(revision 14bb2a439a94b124ced65cec1bb2b8910c5fec63)
@@ -1,6 +1,6 @@
 ;*** BEGIN **********************************************************
 ;**                                                                **
-;** Automatically generated on: Thu Mar 27 14:17:18 2008           **
+;** Automatically generated on: Thu Apr 03 10:03:29 2008           **
 ;**                                                                **
 ;** MakeCAB Version: 6.0.6001.18000                                 **
 ;**                                                                **
@@ -13,18 +13,18 @@
 1,1,manifest.xml,2929
 1,1,LamsSharePointIntegration\feature.xml,701
 1,1,LamsSharePointIntegration\elements.xml,1888
-1,1,LamsSharePointIntegration\ListTemplates\LessonsList.xml,494
+1,1,LamsSharePointIntegration\ListTemplates\LessonsList.xml,492
 1,1,FEATURES\LamsSharePointIntegration\LessonsList\schema.xml,120511
 1,1,FEATURES\LamsSharePointIntegration\LessonsList\AllItems.aspx,2646
 1,1,FEATURES\LamsSharePointIntegration\LessonsList\DispForm.aspx,3192
 1,1,FEATURES\LamsSharePointIntegration\LessonsList\EditForm.aspx,3185
-1,1,FEATURES\LamsSharePointIntegration\LessonsList\NewForm.aspx,14326
-1,1,LAYOUTS\LamsSharePointIntegration\jquery\jquery-1.2.3.pack.js,29846
+1,1,FEATURES\LamsSharePointIntegration\LessonsList\NewForm.aspx,14361
+1,1,LAYOUTS\LamsSharePointIntegration\jquery\jquery-1.2.3.pack.js,29831
 1,1,LAYOUTS\LamsSharePointIntegration\tigra\tree.js,3824
 1,1,LAYOUTS\LamsSharePointIntegration\tigra\tree_tpl.js,2502
-1,1,LAYOUTS\LamsSharePointIntegration\LAMSIntegrationSettings.aspx,8840
-1,1,LAYOUTS\LamsSharePointIntegration\LAMSSchedule.aspx,16609
-1,1,LAYOUTS\LamsSharePointIntegration\LAMSOpenPopup.aspx,8374
+1,1,LAYOUTS\LamsSharePointIntegration\LAMSIntegrationSettings.aspx,8852
+1,1,LAYOUTS\LamsSharePointIntegration\LAMSSchedule.aspx,17326
+1,1,LAYOUTS\LamsSharePointIntegration\LAMSOpenPopup.aspx,8437
 1,1,LAYOUTS\LamsSharePointIntegration\LAMSAjaxServletRequester.ashx,324
 1,1,IMAGES\LamsSharePointIntegration\favicon.ico,3638
 1,1,IMAGES\LamsSharePointIntegration\lams_logo.gif,2082
@@ -40,9 +40,9 @@
 1,1,IMAGES\LamsSharePointIntegration\treeicons\page.gif,169
 1,1,IMAGES\LamsSharePointIntegration\treeicons\plus.gif,89
 1,1,IMAGES\LamsSharePointIntegration\treeicons\plusbottom.gif,90
-1,1,LamsSharePointIntegration.dll,20992
+1,1,LamsSharePointIntegration.dll,17920
 ;*** END ************************************************************
 ;**                                                                **
-;** Automatically generated on: Thu Mar 27 14:17:18 2008           **
+;** Automatically generated on: Thu Apr 03 10:03:29 2008           **
 ;**                                                                **
 ;*** END ************************************************************
Index: LamsSharePointIntegration/LamsSharePointIntegration/setup.rpt
===================================================================
diff -u -r5f3849898f9d77c022066dc244265c806586f91b -r14bb2a439a94b124ced65cec1bb2b8910c5fec63
--- LamsSharePointIntegration/LamsSharePointIntegration/setup.rpt	(.../setup.rpt)	(revision 5f3849898f9d77c022066dc244265c806586f91b)
+++ LamsSharePointIntegration/LamsSharePointIntegration/setup.rpt	(.../setup.rpt)	(revision 14bb2a439a94b124ced65cec1bb2b8910c5fec63)
@@ -1,8 +1,8 @@
-MakeCAB Report: Thu Mar 27 14:17:18 2008
+MakeCAB Report: Thu Apr 03 10:03:29 2008
 
 Total files:             31
-Bytes before:       248,149
-Bytes after:         55,626
-After/Before:            22.42% compression
-Time:                     2.48 seconds ( 0 hr  0 min  2.48 sec)
-Throughput:              97.60 Kb/second
+Bytes before:       245,887
+Bytes after:         54,395
+After/Before:            22.12% compression
+Time:                     0.21 seconds ( 0 hr  0 min  0.21 sec)
+Throughput:            1143.45 Kb/second