Index: win_installer/installer/src/lams2.ini
===================================================================
diff -u -r388ec3500ab44f8bbd700dee150266ddf40ca53e -r7eaf2968347cc9d9f980c7f52615f9de4b341297
--- win_installer/installer/src/lams2.ini	(.../lams2.ini)	(revision 388ec3500ab44f8bbd700dee150266ddf40ca53e)
+++ win_installer/installer/src/lams2.ini	(.../lams2.ini)	(revision 7eaf2968347cc9d9f980c7f52615f9de4b341297)
@@ -104,4 +104,4 @@
 Right=290
 Bottom=131
 State=en_AU - English (Australia)
-ListItems=en_AU - English (Australia)|ar_JO - Arabic (Jordan)|cy_GB - Cymraeg (Cymru)|da_DK - Dansk|de_DE - Deutsch|el_GR - Greek|es_ES - Espa�ol|fr_FR - Fran�ais|it_IT - Italiano|ko_KR - Korean|mi_NZ - Maori|no_NO - Norsk|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|sv_SE - Svenska|vi_VN - Vietnamese|zh_CN - Chinese(Simplified)
+ListItems=en_AU - English (Australia)|ar_JO - Arabic (Jordan)|cy_GB - Cymraeg (Cymru)|da_DK - Dansk|de_DE - Deutsch|el_GR - Greek|es_ES - Espa�ol|fr_FR - Fran�ais|hu_HU - Magyar|it_IT - Italiano|ko_KR - Korean|mi_NZ - Maori|no_NO - Norsk|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|sv_SE - Svenska|vi_VN - Vietnamese|zh_CN - Chinese(Simplified)
Index: win_installer/updater/documents/license.txt
===================================================================
diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -r7eaf2968347cc9d9f980c7f52615f9de4b341297
--- win_installer/updater/documents/license.txt	(.../license.txt)	(revision a346e8c8f13dc57dfca4a13f75d0b4276969e207)
+++ win_installer/updater/documents/license.txt	(.../license.txt)	(revision 7eaf2968347cc9d9f980c7f52615f9de4b341297)
@@ -1,4 +1,4 @@
-LAMS 2.0.4 is released under the GPL license detailed below.  This package
+LAMS 2.1 is released under the GPL license detailed below.  This package
 also includes other libraries/packages, whose respective licenses are
 detailed below.
 
Index: win_installer/updater/documents/readme.txt
===================================================================
diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -r7eaf2968347cc9d9f980c7f52615f9de4b341297
--- win_installer/updater/documents/readme.txt	(.../readme.txt)	(revision a346e8c8f13dc57dfca4a13f75d0b4276969e207)
+++ win_installer/updater/documents/readme.txt	(.../readme.txt)	(revision 7eaf2968347cc9d9f980c7f52615f9de4b341297)
@@ -1,7 +1,7 @@
-LAMS 2.0.4 - Learning Activity Management System
+LAMS 2.1 - Learning Activity Management System
 ----------------------------------------------
 
-This is a pre-packaged copy of LAMS 2.0.4 for Windows 2000, XP, or 2003.
+This is a pre-packaged copy of LAMS 2.1 for Windows 2000, XP, or 2003.
 For the source code, please see the 'Building LAMS' wiki at 
 
 	http://wiki.lamsfoundation.org/display/lams/Building+LAMS 
Index: win_installer/updater/src/ant/update-deploy-tools.xml
===================================================================
diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -r7eaf2968347cc9d9f980c7f52615f9de4b341297
--- win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision a346e8c8f13dc57dfca4a13f75d0b4276969e207)
+++ win_installer/updater/src/ant/update-deploy-tools.xml	(.../update-deploy-tools.xml)	(revision 7eaf2968347cc9d9f980c7f52615f9de4b341297)
@@ -127,6 +127,7 @@
 			<fileset dir="${jboss.deploy}/lams-monitoring.war.tmp">
 				<include name="*"/>
 				<include name="css/*"/>
+				<include name="branching/*"/>
 				<include name="gate/*"/>
 				<include name="grouping/*"/>
 				<include name="images/*"/>
@@ -150,6 +151,7 @@
 			<fileset dir="${jboss.deploy}/lams-learning.war.tmp">
 				<include name="*"/>
 				<include name="css/*"/>
+				<include name="branching/*"/>
 				<include name="exportPortfolio/*"/>
 				<include name="notebook/*"/>
 				<include name="gate/*"/>
Index: win_installer/updater/src/lams2.ini
===================================================================
diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -r7eaf2968347cc9d9f980c7f52615f9de4b341297
--- win_installer/updater/src/lams2.ini	(.../lams2.ini)	(revision a346e8c8f13dc57dfca4a13f75d0b4276969e207)
+++ win_installer/updater/src/lams2.ini	(.../lams2.ini)	(revision 7eaf2968347cc9d9f980c7f52615f9de4b341297)
@@ -104,4 +104,4 @@
 Right=290
 Bottom=131
 State=en_AU - English (Australia)
-ListItems=en_AU - English (Australia)|ar_JO - Arabic (Jordan)|cy_GB - Cymraeg (Cymru)|da_DK - Dansk|de_DE - Deutsch|el_GR - Greek|es_ES - Espa�ol|fr_FR - Fran�ais|it_IT - Italiano|ko_KR - Korean|mi_NZ - Maori|no_NO - Norsk|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|sv_SE - Svenska|vi_VN - Vietnamese|zh_CN - Chinese(Simplified)
+ListItems=en_AU - English (Australia)|ar_JO - Arabic (Jordan)|cy_GB - Cymraeg (Cymru)|da_DK - Dansk|de_DE - Deutsch|el_GR - Greek|es_ES - Espa�ol|fr_FR - Fran�ais|hu_HU - Magyar|it_IT - Italiano|ko_KR - Korean|mi_NZ - Maori|no_NO - Norsk|pl_PL - Polski|pt_BR - Portugu�s (Brasil)|sv_SE - Svenska|vi_VN - Vietnamese|zh_CN - Chinese(Simplified)
Index: win_installer/updater/src/updater.nsi
===================================================================
diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -r7eaf2968347cc9d9f980c7f52615f9de4b341297
--- win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision a346e8c8f13dc57dfca4a13f75d0b4276969e207)
+++ win_installer/updater/src/updater.nsi	(.../updater.nsi)	(revision 7eaf2968347cc9d9f980c7f52615f9de4b341297)
@@ -1100,6 +1100,9 @@
     File "${SOURCE_LAMS_EAR}\lams-www.war\WEB-INF\tags\*"
     
     SetoutPath "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war\"
+    File "${SOURCE_LAMS_EAR}\lams-www.war\copyright.jsp"
+    
+    SetoutPath "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\lams-www.war\"
     File "${DOCUMENTS}\news-${PREVIOUS_VERSION}.html"
     ;if news and news-${PREVIOUS_VERSION} are the same
 
Index: win_installer/utils/src/revert.nsi
===================================================================
diff -u -ra346e8c8f13dc57dfca4a13f75d0b4276969e207 -r7eaf2968347cc9d9f980c7f52615f9de4b341297
--- win_installer/utils/src/revert.nsi	(.../revert.nsi)	(revision a346e8c8f13dc57dfca4a13f75d0b4276969e207)
+++ win_installer/utils/src/revert.nsi	(.../revert.nsi)	(revision 7eaf2968347cc9d9f980c7f52615f9de4b341297)
@@ -263,7 +263,7 @@
    
         
     # convert '\' to '/' for Ant's benefit
-    Push "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear"
+    Push "$INSTDIR\jboss-4.0.2\server\default\deploy\lams.ear\"
     Push "\"
     Call StrSlash
     Pop $2
@@ -298,7 +298,7 @@
     nsExec::ExecToStack $5
     Pop $3
     Pop $4
-    ${If} $3 == 1
+    ${If} $3 != 0
         detailprint "Problem Restoring database"
         goto error
     ${EndIf}
@@ -313,7 +313,7 @@
     done:
         rmdir "$TEMP\apache-ant-1.6.5"
         delete "$TEMP\revert.xml"
-        delete "$TEMP\revert.properties"
+        ;delete "$TEMP\revert.properties"
 Functionend
 
 Function updateRegistry