Index: lams_flash/src/central/flex/BranchManager/.actionScriptProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/BranchManager/.actionScriptProperties	(revision 0)
+++ lams_flash/src/central/flex/BranchManager/.actionScriptProperties	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="BranchManager.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.124" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<compilerSourcePath/>
+<libraryPath defaultLinkType="1">
+<libraryPathEntry kind="4" path=""/>
+<libraryPathEntry kind="1" linkType="1" path="libs"/>
+</libraryPath>
+<sourceAttachmentPath/>
+</compiler>
+<applications>
+<application path="BranchManager.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>
Index: lams_flash/src/central/flex/BranchManager/.flexProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/BranchManager/.flexProperties	(revision 0)
+++ lams_flash/src/central/flex/BranchManager/.flexProperties	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
Index: lams_flash/src/central/flex/BranchManager/.project
===================================================================
diff -u
--- lams_flash/src/central/flex/BranchManager/.project	(revision 0)
+++ lams_flash/src/central/flex/BranchManager/.project	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>BranchManager</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.flexbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.adobe.flexbuilder.project.flexnature</nature>
+		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>bin-release1</name>
+			<type>2</type>
+			<location>D:/LAMS_HEAD/lams_monitoring/web/branching</location>
+		</link>
+	</linkedResources>
+</projectDescription>
Index: lams_flash/src/central/flex/BranchManager/html-template/AC_OETags.js
===================================================================
diff -u
--- lams_flash/src/central/flex/BranchManager/html-template/AC_OETags.js	(revision 0)
+++ lams_flash/src/central/flex/BranchManager/html-template/AC_OETags.js	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,278 @@
+// Flash Player Version Detection - Rev 1.6
+// Detect Client Browser type
+// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
+var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
+var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
+var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
+
+function ControlVersion()
+{
+	var version;
+	var axo;
+	var e;
+
+	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
+
+	try {
+		// version will be set for 7.X or greater players
+		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		version = axo.GetVariable("$version");
+	} catch (e) {
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 6.X players only
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+			
+			// installed player is some revision of 6.0
+			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
+			// so we have to be careful. 
+			
+			// default to the first public version
+			version = "WIN 6,0,21,0";
+
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			axo.AllowScriptAccess = "always";
+
+			// safe to call for 6.0r47 or greater
+			version = axo.GetVariable("$version");
+
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 4.X or 5.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = axo.GetVariable("$version");
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 3.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = "WIN 3,0,18,0";
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 2.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			version = "WIN 2,0,0,11";
+		} catch (e) {
+			version = -1;
+		}
+	}
+	
+	return version;
+}
+
+// JavaScript helper required to detect Flash Player PlugIn version information
+function GetSwfVer(){
+	// NS/Opera version >= 3 check for Flash plugin in plugin array
+	var flashVer = -1;
+	
+	if (navigator.plugins != null && navigator.plugins.length > 0) {
+		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
+			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+			var descArray = flashDescription.split(" ");
+			var tempArrayMajor = descArray[2].split(".");			
+			var versionMajor = tempArrayMajor[0];
+			var versionMinor = tempArrayMajor[1];
+			var versionRevision = descArray[3];
+			if (versionRevision == "") {
+				versionRevision = descArray[4];
+			}
+			if (versionRevision[0] == "d") {
+				versionRevision = versionRevision.substring(1);
+			} else if (versionRevision[0] == "r") {
+				versionRevision = versionRevision.substring(1);
+				if (versionRevision.indexOf("d") > 0) {
+					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
+				}
+			} else if (versionRevision[0] == "b") {
+				versionRevision = versionRevision.substring(1);
+			}
+			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
+		}
+	}
+	// MSN/WebTV 2.6 supports Flash 4
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
+	// WebTV 2.5 supports Flash 3
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
+	// older WebTV supports Flash 2
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
+	else if ( isIE && isWin && !isOpera ) {
+		flashVer = ControlVersion();
+	}
+	return flashVer;
+}
+
+// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+{
+	versionStr = GetSwfVer();
+	if (versionStr == -1 ) {
+		return false;
+	} else if (versionStr != 0) {
+		if(isIE && isWin && !isOpera) {
+			// Given "WIN 2,0,0,11"
+			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
+			tempString        = tempArray[1];			// "2,0,0,11"
+			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
+		} else {
+			versionArray      = versionStr.split(".");
+		}
+		var versionMajor      = versionArray[0];
+		var versionMinor      = versionArray[1];
+		var versionRevision   = versionArray[2];
+
+        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
+		if (versionMajor > parseFloat(reqMajorVer)) {
+			return true;
+		} else if (versionMajor == parseFloat(reqMajorVer)) {
+			if (versionMinor > parseFloat(reqMinorVer))
+				return true;
+			else if (versionMinor == parseFloat(reqMinorVer)) {
+				if (versionRevision >= parseFloat(reqRevision))
+					return true;
+			}
+		}
+		return false;
+	}
+}
+
+function AC_AddExtension(src, ext)
+{
+  if (src.indexOf('?') != -1)
+    return src.replace(/\?/, ext+'?'); 
+  else
+    return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs) 
+{ 
+    var str = '';
+    if (isIE && isWin && !isOpera)
+    {
+  		str += '<object ';
+  		for (var i in objAttrs)
+  			str += i + '="' + objAttrs[i] + '" ';
+  		str += '>';
+  		for (var i in params)
+  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
+  		str += '</object>';
+    } else {
+  		str += '<embed ';
+  		for (var i in embedAttrs)
+  			str += i + '="' + embedAttrs[i] + '" ';
+  		str += '> </embed>';
+    }
+
+    document.write(str);
+}
+
+function AC_FL_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+     , "application/x-shockwave-flash"
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+  var ret = new Object();
+  ret.embedAttrs = new Object();
+  ret.params = new Object();
+  ret.objAttrs = new Object();
+  for (var i=0; i < args.length; i=i+2){
+    var currArg = args[i].toLowerCase();    
+
+    switch (currArg){	
+      case "classid":
+        break;
+      case "pluginspage":
+        ret.embedAttrs[args[i]] = args[i+1];
+        break;
+      case "src":
+      case "movie":	
+        args[i+1] = AC_AddExtension(args[i+1], ext);
+        ret.embedAttrs["src"] = args[i+1];
+        ret.params[srcParamName] = args[i+1];
+        break;
+      case "onafterupdate":
+      case "onbeforeupdate":
+      case "onblur":
+      case "oncellchange":
+      case "onclick":
+      case "ondblClick":
+      case "ondrag":
+      case "ondragend":
+      case "ondragenter":
+      case "ondragleave":
+      case "ondragover":
+      case "ondrop":
+      case "onfinish":
+      case "onfocus":
+      case "onhelp":
+      case "onmousedown":
+      case "onmouseup":
+      case "onmouseover":
+      case "onmousemove":
+      case "onmouseout":
+      case "onkeypress":
+      case "onkeydown":
+      case "onkeyup":
+      case "onload":
+      case "onlosecapture":
+      case "onpropertychange":
+      case "onreadystatechange":
+      case "onrowsdelete":
+      case "onrowenter":
+      case "onrowexit":
+      case "onrowsinserted":
+      case "onstart":
+      case "onscroll":
+      case "onbeforeeditfocus":
+      case "onactivate":
+      case "onbeforedeactivate":
+      case "ondeactivate":
+      case "type":
+      case "codebase":
+        ret.objAttrs[args[i]] = args[i+1];
+        break;
+      case "id":
+      case "width":
+      case "height":
+      case "align":
+      case "vspace": 
+      case "hspace":
+      case "class":
+      case "title":
+      case "accesskey":
+      case "name":
+      case "tabindex":
+        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+        break;
+      default:
+        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+    }
+  }
+  ret.objAttrs["classid"] = classid;
+  if (mimeType) ret.embedAttrs["type"] = mimeType;
+  return ret;
+}
+
+
Index: lams_flash/src/central/flex/BranchManager/html-template/index.template.html
===================================================================
diff -u
--- lams_flash/src/central/flex/BranchManager/html-template/index.template.html	(revision 0)
+++ lams_flash/src/central/flex/BranchManager/html-template/index.template.html	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,121 @@
+<!-- saved from url=(0014)about:internet -->
+<html lang="en">
+
+<!-- 
+Smart developers always View Source. 
+
+This application was built using Adobe Flex, an open source framework
+for building rich Internet applications that get delivered via the
+Flash Player or to desktops via Adobe AIR. 
+
+Learn more about Flex at http://flex.org 
+// -->
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!--  BEGIN Browser History required section -->
+<link rel="stylesheet" type="text/css" href="history/history.css" />
+<!--  END Browser History required section -->
+
+<title>${title}</title>
+<script src="AC_OETags.js" language="javascript"></script>
+
+<!--  BEGIN Browser History required section -->
+<script src="history/history.js" language="javascript"></script>
+<!--  END Browser History required section -->
+
+<style>
+body { margin: 0px; overflow:hidden }
+</style>
+<script language="JavaScript" type="text/javascript">
+<!--
+// -----------------------------------------------------------------------------
+// Globals
+// Major version of Flash required
+var requiredMajorVersion = ${version_major};
+// Minor version of Flash required
+var requiredMinorVersion = ${version_minor};
+// Minor version of Flash required
+var requiredRevision = ${version_revision};
+// -----------------------------------------------------------------------------
+// -->
+</script>
+</head>
+
+<body scroll="no">
+<script language="JavaScript" type="text/javascript">
+<!--
+// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+var hasProductInstall = DetectFlashVer(6, 0, 65);
+
+// Version check based upon the values defined in globals
+var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+
+if ( hasProductInstall && !hasRequestedVersion ) {
+	// DO NOT MODIFY THE FOLLOWING FOUR LINES
+	// Location visited after installation is complete if installation is required
+	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+	var MMredirectURL = window.location;
+    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+    var MMdoctitle = document.title;
+
+	AC_FL_RunContent(
+		"src", "playerProductInstall",
+		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+		"width", "${width}",
+		"height", "${height}",
+		"align", "middle",
+		"id", "${application}",
+		"quality", "high",
+		"bgcolor", "${bgcolor}",
+		"name", "${application}",
+		"allowScriptAccess","sameDomain",
+		"type", "application/x-shockwave-flash",
+		"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+} else if (hasRequestedVersion) {
+	// if we've detected an acceptable version
+	// embed the Flash Content SWF when all tests are passed
+	AC_FL_RunContent(
+			"src", "${swf}",
+			"width", "${width}",
+			"height", "${height}",
+			"align", "middle",
+			"id", "${application}",
+			"quality", "high",
+			"bgcolor", "${bgcolor}",
+			"name", "${application}",
+			"allowScriptAccess","sameDomain",
+			"type", "application/x-shockwave-flash",
+			"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+  } else {  // flash is too old or we can't detect the plugin
+    var alternateContent = 'Alternate HTML content should be placed here. '
+  	+ 'This content requires the Adobe Flash Player. '
+   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+    document.write(alternateContent);  // insert non-flash content
+  }
+// -->
+</script>
+<noscript>
+  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+			id="${application}" width="${width}" height="${height}"
+			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+			<param name="movie" value="${swf}.swf" />
+			<param name="quality" value="high" />
+			<param name="bgcolor" value="${bgcolor}" />
+			<param name="allowScriptAccess" value="sameDomain" />
+			<embed src="${swf}.swf" quality="high" bgcolor="${bgcolor}"
+				width="${width}" height="${height}" name="${application}" align="middle"
+				play="true"
+				loop="false"
+				quality="high"
+				allowScriptAccess="sameDomain"
+				type="application/x-shockwave-flash"
+				pluginspage="http://www.adobe.com/go/getflashplayer">
+			</embed>
+	</object>
+</noscript>
+</body>
+</html>
Index: lams_flash/src/central/flex/BranchManager/html-template/playerProductInstall.swf
===================================================================
diff -u
Binary files differ
Index: lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml
===================================================================
diff -u
--- lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml	(revision 0)
+++ lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" creationComplete="initApp();" width="793" height="454" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]">
+       
+    <!-- httpservices -->
+    <mx:HTTPService 
+        id="getBranchesService"
+        url="http://172.20.100.220:8080/lams/monitoring/branching.do"
+        method="POST"
+        resultFormat="xml"
+        result="getBranchesSuccessHandler(event);"
+        fault="getBranchesFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>getBranches</method>
+            <activityID></activityID>
+        </mx:request>
+    </mx:HTTPService>
+
+    <mx:HTTPService 
+        id="getMembersNotBranchedService"
+        url="http://172.20.100.220:8080/lams/monitoring/branching.do"
+        method="POST"
+        resultFormat="xml"
+        result="getMembersNotBranchedSuccessHandler(event);"
+        fault="getMembersNotBranchedFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>getClassMembersNotGrouped</method>
+            <activityID></activityID>
+        </mx:request>
+    </mx:HTTPService>
+
+    <mx:HTTPService 
+        id="getBranchMembersService"
+        url="http://172.20.100.220:8080/lams/monitoring/branching.do"
+        method="POST"
+        resultFormat="xml"
+        result="getBranchMembersSuccessHandler(event);"
+        fault="getBranchMembersFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>getBranchMembers</method>
+            <branchID></branchID>
+            <activityID></activityID>
+        </mx:request>
+    </mx:HTTPService>
+
+    <mx:HTTPService 
+        id="addMembersService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="addMembersSuccessHandler(event);"
+        fault="addMembersFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>addMembers</method>
+            <activityID></activityID>
+            <branchID></branchID>
+            <members></members>
+        </mx:request>
+    </mx:HTTPService>
+    
+    <mx:HTTPService 
+        id="removeMembersService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="removeMembersSuccessHandler(event);"
+        fault="removeMembersFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>removeMembers</method>
+            <activityID></activityID>
+            <branchID></branchID>
+            <members></members>
+        </mx:request>
+    </mx:HTTPService>
+    
+    <mx:Script>
+		<![CDATA[
+			//imports
+			import mx.events.CloseEvent;
+			import mx.events.DropdownEvent;
+			import mx.events.DragEvent;
+			import mx.collections.XMLListCollection;
+			import mx.core.UITextField;
+			import mx.rpc.events.ResultEvent;
+			import mx.controls.Spacer;
+			import mx.controls.Button;
+			import mx.containers.ControlBar;
+			import mx.controls.dataGridClasses.DataGridColumn;
+			import mx.collections.ArrayCollection;
+			import mx.containers.Panel;
+			import mx.controls.DataGrid;
+			import mx.controls.Alert;
+			import mx.managers.PopUpManager;
+			import mx.containers.TitleWindow;
+			import flash.text.TextField;
+			
+			// collection of panels
+			private var panels:ArrayCollection = new ArrayCollection();
+			
+			// collection of panels respective dataproviders (also collections)
+			private var panelLearnerDataProviders:ArrayCollection = new ArrayCollection();
+			
+			// initial learners collection (used by global datagrid)
+			private var intialLearners:ArrayCollection = new ArrayCollection();
+			
+			// total number of branches add (even after removal)
+			private var totalBranchesAdded:int = 0;
+			
+			// last remove event stored
+			private var lastRemoveEvent:Event;
+			
+			// variables grabbed from flashvars
+			private var lessonID:int;
+			private var activityID:int;
+			private var serverUrl:String;
+			private var mayDelete:Boolean;
+			private var title:String;
+			private var languageXML:XML;
+			private var viewMode:Boolean;
+			
+			// constants
+			private const SERVLET_PATH:String = "monitoring/chosenBranching.do";
+						
+			// initializes application
+			private function initApp():void {
+				// get flashvars
+				lessonID = Application.application.parameters.lessonID;
+				activityID = Application.application.parameters.activityID;
+				serverUrl = Application.application.parameters.serverUrl;
+				title = Application.application.parameters.title;
+				mayDelete = stringToBool(Application.application.parameters.mayDelete);
+				languageXML = XML(Application.application.parameters.languageXML);
+				viewMode = stringToBool(Application.application.parameters.viewMode);
+				
+				// initialize misc. stuff including events
+				mainDataGrid_dg.dataProvider = intialLearners;
+				mainDataGrid_dg.addEventListener(DragEvent.DRAG_DROP, dragDropHandler);
+				finish_btn.addEventListener(MouseEvent.CLICK, closeWindowHandler);	
+				
+				// if flashvars from jsp are missing
+				if(lessonID == 0 || activityID == 0 || serverUrl == "" || languageXML == null) {
+					Alert.show("Error occured: flashvars not initialized");
+					application.enabled = false;
+				}
+				else {
+					initServices();
+					initButtonsAndDragging();
+					initLabels();
+					getMembersNotBranchedService.send();
+					getBranchesService.send();
+				}
+			}
+			
+			// initialize labels from language xml
+			private function initLabels():void{
+				finish_btn.label = languageXML.language.entry.(@key=="button.finished").name;
+				mainDataGridCol1_col.headerText = languageXML.language.entry.(@key=="label.branching.non.allocated.users.heading").name;
+				status_lbl.text = languageXML.language.entry.(@key=="label.grouping.status").name;
+			}
+			
+			// initialize buttons and dragging depending on jsp conditions
+			private function initButtonsAndDragging():void {
+				// allow movement of students if deleting is allowed
+				mainDataGrid_dg.dragEnabled = mayDelete;
+				mainDataGrid_dg.dropEnabled = mayDelete;
+				mainDataGrid_dg.dragMoveEnabled = mayDelete;
+				mainDataGrid_dg.allowDragSelection = mayDelete;
+			}
+			
+			// set request parameters
+			private function initServices():void {
+				getBranchesService.url = serverUrl + SERVLET_PATH;
+				getMembersNotBranchedService.url = serverUrl + SERVLET_PATH;
+				getBranchMembersService.url = serverUrl + SERVLET_PATH;
+				addMembersService.url = serverUrl + SERVLET_PATH;
+				removeMembersService.url = serverUrl + SERVLET_PATH;
+				
+				getBranchesService.request.activityID = activityID;
+				
+				getMembersNotBranchedService.request.activityID = activityID;
+				getMembersNotBranchedService.request.lessonID = lessonID;
+				
+				getBranchMembersService.request.activityID = activityID;
+				
+				addMembersService.request.activityID = activityID;
+				
+				removeMembersService.request.activityID = activityID;
+			}
+			
+			
+			// adds a new branch panel
+			private function addBranchPanel(id:String = null, title:String = null):Boolean {
+				// create components
+                var newPanel:Panel = new Panel();
+               	var newDataGrid:DataGrid = new DataGrid();
+               	var newLearnersCollection:ArrayCollection = new ArrayCollection([]);
+               	var newDataGridColumn:DataGridColumn = new DataGridColumn();
+				
+				// increment total number of branch panels added
+				totalBranchesAdded++;
+				
+               	// push new branch panel and its dataprovider into their respective collections
+               	panels.addItem(newPanel);
+               	panelLearnerDataProviders.addItem(newLearnersCollection);
+             	             	
+             	// set new panel attributes
+                newPanel.width = learnerBranches_tile.width / 2 - 15;
+                newPanel.height = learnerBranches_tile.height / 2 - 6;
+                
+                if(id == null){
+ 					newPanel.id = "branch" + String(totalBranchesAdded) + "Learners_pnl";            
+               	}
+               	else {
+               		newPanel.id = id;
+               	}
+               	    
+                if(title == null){
+ 					newPanel.title = "Branch " + String(totalBranchesAdded);               
+               	}
+               	else {
+               		newPanel.title = title;
+               	}
+
+				// set new column attributes
+				newDataGridColumn.headerText = languageXML.language.entry.(@key=="label.branching.learners").name;
+				newDataGridColumn.dataField = "displayName";
+				
+				// set new datagrid attributes
+               	newDataGrid.columns = [newDataGridColumn];
+               	newDataGrid.percentWidth = 100;
+               	newDataGrid.percentHeight = 100;
+               	newDataGrid.allowMultipleSelection = true;
+               	newDataGrid.addEventListener(DragEvent.DRAG_DROP, dragDropHandler);
+               	newDataGrid.dataProvider = newLearnersCollection;
+				
+				newDataGrid.dropEnabled = mayDelete;
+               	newDataGrid.dragEnabled = mayDelete;
+               	newDataGrid.dragMoveEnabled= mayDelete;
+               	newDataGrid.allowDragSelection = mayDelete;
+               	
+				// add elements to the panel
+				newPanel.addChild(newDataGrid);
+				
+				// add the panel to the tile
+				learnerBranches_tile.addChild(newPanel);
+				
+				return true;
+			}
+					                
+	        // find a panel index from its branchID
+	        private function findPanelIndex(branchID:int):int{
+	        	for(var i:int = 0; i < panels.length; i++) {
+	     			if(Panel(panels[i]).id == String(branchID)){
+						return i;
+	     			}
+	     		}
+	     		
+	     		return -1;
+	        }
+	        
+	        // convert a string to a boolean
+	        private function stringToBool(string:String):Boolean{
+	        	switch(string){
+	        		case "1":
+	        		case "true":
+	        		case "yes":
+	        			return true;
+	        		case "0":
+	        		case "false":
+	        		case "no":
+	        			return false;
+	        		default:
+	        		return Boolean(string);
+	        	}
+	        }
+	                            
+	        // click handler for the finish button
+	        private function closeWindowHandler(e:MouseEvent):void{
+	        	ExternalInterface.call("closeWindow");
+	        }
+	        
+	        // drag drop handler
+	        private function dragDropHandler(e:DragEvent):void {
+	        	// if the drag and drop source and destination are not the same
+	        	if(e.dragInitiator != e.currentTarget){
+	        		// get selected items in datagrid
+		        	var selectedNames:Array = DataGrid(e.dragInitiator).selectedItems;
+		        	var selectedNamesString:String = "";
+		        	
+		        	// format the learner ids as needed serverside
+		        	for(var i:int = 0; i < selectedNames.length; i++){
+		        		selectedNamesString += selectedNames[i].id;
+		        		
+		        		if(i < selectedNames.length - 1)
+		        		{
+		        			selectedNamesString += ",";
+		        		}
+		        	}
+					
+					// if the source is not the initial learners grid, remove members
+					if(DataGrid(e.dragInitiator).id != "mainDataGrid_dg") {
+						removeMembersService.request.branchID = Panel(e.dragInitiator.parent).id;
+						removeMembersService.request.members = selectedNamesString;
+						removeMembersService.send();
+					}
+					
+					// if the destination is not the initial learners grid, add members
+					if(DataGrid(e.currentTarget).id != "mainDataGrid_dg") {
+			        	addMembersService.request.branchID = Panel(e.currentTarget.parent).id;
+			        	addMembersService.request.members = selectedNamesString;
+			        	addMembersService.send();
+					}
+	        	}
+	        }
+	        
+	        // -- httpservice handlers --
+	        private function getBranchesSuccessHandler(e:ResultEvent):void {
+	        	var xmlResult:XMLListCollection = new XMLListCollection(XMLList(e.result).branches.branch);
+	        	
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+					addBranchPanel(xmlResult.getItemAt(i).id.toString(), xmlResult.getItemAt(i).name.toString());
+	        	}
+	        	
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+	        		getBranchMembersService.request.branchID = xmlResult.getItemAt(i).id.toString();
+	        		getBranchMembersService.send();
+	        	}
+	        }
+	        
+	      	private function getBranchesFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	       
+	        private function getMembersNotBranchedSuccessHandler(e:ResultEvent):void {
+	        	var xmlResult:XMLListCollection = new XMLListCollection(XMLList(e.result).users.user);
+	        	var branchID:int = XMLList(e.result).branchID.toString();
+	     		
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+	        		intialLearners.addItem({displayName: xmlResult.getItemAt(i).displayName.toString(), id: xmlResult.getItemAt(i).id.toString()});
+	        	}
+	        }
+	        
+	      	private function getMembersNotBranchedFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function getBranchMembersSuccessHandler(e:ResultEvent):void {
+	        	var xmlResult:XMLListCollection = new XMLListCollection(XMLList(e.result).users.user);
+	        	var branchID:int = XMLList(e.result).branchID.toString();
+	     		var indexToUse:int = findPanelIndex(branchID);
+	     		
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+	        		panelLearnerDataProviders[indexToUse].addItem({displayName: xmlResult.getItemAt(i).displayName.toString(), id: xmlResult.getItemAt(i).id.toString()});
+	        	}
+	        }
+	        
+	      	private function getBranchMembersFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function addMembersSuccessHandler(e:ResultEvent):void {
+	        	// nothing to do here
+	        }
+	        
+	      	private function addMembersFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function removeMembersSuccessHandler(e:ResultEvent):void {
+	        	// nothing to do here
+	        }
+	        
+	      	private function removeMembersFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function addBranchSuccessHandler(e:ResultEvent):void {
+	        	addBranchPanel(XMLList(e.result).branch.id.toString()), XMLList(e.result).branch.name.toString();
+	        }
+	        	      	
+	      	private function changeBranchNameSuccessHandler(e:ResultEvent):void {
+	        	var branchID:int = XMLList(e.result).branch.id.toString();
+	        	var branchName:String = XMLList(e.result).branch.newName.toString();
+	        	var indexToUse:int = findPanelIndex(branchID);
+	        	
+	        	Panel(panels.getItemAt(indexToUse)).title = branchName;
+	        }
+	        
+	      	private function changeGroupNameFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        // -- getters and setters --
+	        
+	        public function getLanguageXML():XML{
+	        	return languageXML;
+	        }
+		]]>
+	</mx:Script>
+
+	<mx:DataGrid id="mainDataGrid_dg" width="185" dragEnabled="true" dropEnabled="true" dragMoveEnabled="true" allowMultipleSelection="true" allowDragSelection="true" left="10" top="10" bottom="10">
+		<mx:columns>
+			<mx:DataGridColumn id="mainDataGridCol1_col" dataField="displayName"/>
+		</mx:columns>
+	</mx:DataGrid>
+	<mx:Tile verticalScrollPolicy="auto" id="learnerBranches_tile" right="10" top="10" bottom="48" left="203">
+	</mx:Tile>
+	<mx:HBox verticalAlign="middle" bottom="10" right="10" height="30" left="203">
+		<mx:Label id="status_lbl"/>
+		<mx:SWFLoader source="../bin-debug/loading_small.swf" autoLoad="true" id="working_swf" visible="false"/>
+		<mx:Spacer width="100%"/>
+		<mx:Button id="finish_btn"/>
+		<mx:SWFLoader visible="false">
+			<mx:source>../bin-debug/loading_small.swf</mx:source>
+		</mx:SWFLoader>
+	</mx:HBox>
+	
+</mx:Application>
Index: lams_flash/src/central/flex/GroupManager/.actionScriptProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/.actionScriptProperties	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/.actionScriptProperties	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="GroupManager.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.124" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<compilerSourcePath/>
+<libraryPath defaultLinkType="1">
+<libraryPathEntry kind="4" path=""/>
+<libraryPathEntry kind="1" linkType="1" path="libs"/>
+</libraryPath>
+<sourceAttachmentPath/>
+</compiler>
+<applications>
+<application path="GroupManager.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>
Index: lams_flash/src/central/flex/GroupManager/.flexProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/.flexProperties	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/.flexProperties	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
Index: lams_flash/src/central/flex/GroupManager/.project
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/.project	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/.project	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>GroupManager</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.flexbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.adobe.flexbuilder.project.flexnature</nature>
+		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>bin-release1</name>
+			<type>2</type>
+			<location>D:/LAMS_HEAD/lams_monitoring/web/grouping</location>
+		</link>
+	</linkedResources>
+</projectDescription>
Index: lams_flash/src/central/flex/GroupManager/.settings/org.eclipse.core.resources.prefs
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/.settings/org.eclipse.core.resources.prefs	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/.settings/org.eclipse.core.resources.prefs	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,3 @@
+#Wed Nov 05 09:59:00 EST 2008
+eclipse.preferences.version=1
+encoding/<project>=utf-8
Index: lams_flash/src/central/flex/GroupManager/html-template/AC_OETags.js
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/html-template/AC_OETags.js	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/html-template/AC_OETags.js	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,278 @@
+// Flash Player Version Detection - Rev 1.6
+// Detect Client Browser type
+// Copyright(c) 2005-2006 Adobe Macromedia Software, LLC. All rights reserved.
+var isIE  = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
+var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
+var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
+
+function ControlVersion()
+{
+	var version;
+	var axo;
+	var e;
+
+	// NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
+
+	try {
+		// version will be set for 7.X or greater players
+		axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
+		version = axo.GetVariable("$version");
+	} catch (e) {
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 6.X players only
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
+			
+			// installed player is some revision of 6.0
+			// GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
+			// so we have to be careful. 
+			
+			// default to the first public version
+			version = "WIN 6,0,21,0";
+
+			// throws if AllowScripAccess does not exist (introduced in 6.0r47)		
+			axo.AllowScriptAccess = "always";
+
+			// safe to call for 6.0r47 or greater
+			version = axo.GetVariable("$version");
+
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 4.X or 5.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = axo.GetVariable("$version");
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 3.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
+			version = "WIN 3,0,18,0";
+		} catch (e) {
+		}
+	}
+
+	if (!version)
+	{
+		try {
+			// version will be set for 2.X player
+			axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
+			version = "WIN 2,0,0,11";
+		} catch (e) {
+			version = -1;
+		}
+	}
+	
+	return version;
+}
+
+// JavaScript helper required to detect Flash Player PlugIn version information
+function GetSwfVer(){
+	// NS/Opera version >= 3 check for Flash plugin in plugin array
+	var flashVer = -1;
+	
+	if (navigator.plugins != null && navigator.plugins.length > 0) {
+		if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
+			var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+			var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+			var descArray = flashDescription.split(" ");
+			var tempArrayMajor = descArray[2].split(".");			
+			var versionMajor = tempArrayMajor[0];
+			var versionMinor = tempArrayMajor[1];
+			var versionRevision = descArray[3];
+			if (versionRevision == "") {
+				versionRevision = descArray[4];
+			}
+			if (versionRevision[0] == "d") {
+				versionRevision = versionRevision.substring(1);
+			} else if (versionRevision[0] == "r") {
+				versionRevision = versionRevision.substring(1);
+				if (versionRevision.indexOf("d") > 0) {
+					versionRevision = versionRevision.substring(0, versionRevision.indexOf("d"));
+				}
+			} else if (versionRevision[0] == "b") {
+				versionRevision = versionRevision.substring(1);
+			}
+			var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
+		}
+	}
+	// MSN/WebTV 2.6 supports Flash 4
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
+	// WebTV 2.5 supports Flash 3
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
+	// older WebTV supports Flash 2
+	else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
+	else if ( isIE && isWin && !isOpera ) {
+		flashVer = ControlVersion();
+	}
+	return flashVer;
+}
+
+// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
+function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
+{
+	versionStr = GetSwfVer();
+	if (versionStr == -1 ) {
+		return false;
+	} else if (versionStr != 0) {
+		if(isIE && isWin && !isOpera) {
+			// Given "WIN 2,0,0,11"
+			tempArray         = versionStr.split(" "); 	// ["WIN", "2,0,0,11"]
+			tempString        = tempArray[1];			// "2,0,0,11"
+			versionArray      = tempString.split(",");	// ['2', '0', '0', '11']
+		} else {
+			versionArray      = versionStr.split(".");
+		}
+		var versionMajor      = versionArray[0];
+		var versionMinor      = versionArray[1];
+		var versionRevision   = versionArray[2];
+
+        	// is the major.revision >= requested major.revision AND the minor version >= requested minor
+		if (versionMajor > parseFloat(reqMajorVer)) {
+			return true;
+		} else if (versionMajor == parseFloat(reqMajorVer)) {
+			if (versionMinor > parseFloat(reqMinorVer))
+				return true;
+			else if (versionMinor == parseFloat(reqMinorVer)) {
+				if (versionRevision >= parseFloat(reqRevision))
+					return true;
+			}
+		}
+		return false;
+	}
+}
+
+function AC_AddExtension(src, ext)
+{
+  if (src.indexOf('?') != -1)
+    return src.replace(/\?/, ext+'?'); 
+  else
+    return src + ext;
+}
+
+function AC_Generateobj(objAttrs, params, embedAttrs) 
+{ 
+    var str = '';
+    if (isIE && isWin && !isOpera)
+    {
+  		str += '<object ';
+  		for (var i in objAttrs)
+  			str += i + '="' + objAttrs[i] + '" ';
+  		str += '>';
+  		for (var i in params)
+  			str += '<param name="' + i + '" value="' + params[i] + '" /> ';
+  		str += '</object>';
+    } else {
+  		str += '<embed ';
+  		for (var i in embedAttrs)
+  			str += i + '="' + embedAttrs[i] + '" ';
+  		str += '> </embed>';
+    }
+
+    document.write(str);
+}
+
+function AC_FL_RunContent(){
+  var ret = 
+    AC_GetArgs
+    (  arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+     , "application/x-shockwave-flash"
+    );
+  AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
+}
+
+function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
+  var ret = new Object();
+  ret.embedAttrs = new Object();
+  ret.params = new Object();
+  ret.objAttrs = new Object();
+  for (var i=0; i < args.length; i=i+2){
+    var currArg = args[i].toLowerCase();    
+
+    switch (currArg){	
+      case "classid":
+        break;
+      case "pluginspage":
+        ret.embedAttrs[args[i]] = args[i+1];
+        break;
+      case "src":
+      case "movie":	
+        args[i+1] = AC_AddExtension(args[i+1], ext);
+        ret.embedAttrs["src"] = args[i+1];
+        ret.params[srcParamName] = args[i+1];
+        break;
+      case "onafterupdate":
+      case "onbeforeupdate":
+      case "onblur":
+      case "oncellchange":
+      case "onclick":
+      case "ondblClick":
+      case "ondrag":
+      case "ondragend":
+      case "ondragenter":
+      case "ondragleave":
+      case "ondragover":
+      case "ondrop":
+      case "onfinish":
+      case "onfocus":
+      case "onhelp":
+      case "onmousedown":
+      case "onmouseup":
+      case "onmouseover":
+      case "onmousemove":
+      case "onmouseout":
+      case "onkeypress":
+      case "onkeydown":
+      case "onkeyup":
+      case "onload":
+      case "onlosecapture":
+      case "onpropertychange":
+      case "onreadystatechange":
+      case "onrowsdelete":
+      case "onrowenter":
+      case "onrowexit":
+      case "onrowsinserted":
+      case "onstart":
+      case "onscroll":
+      case "onbeforeeditfocus":
+      case "onactivate":
+      case "onbeforedeactivate":
+      case "ondeactivate":
+      case "type":
+      case "codebase":
+        ret.objAttrs[args[i]] = args[i+1];
+        break;
+      case "id":
+      case "width":
+      case "height":
+      case "align":
+      case "vspace": 
+      case "hspace":
+      case "class":
+      case "title":
+      case "accesskey":
+      case "name":
+      case "tabindex":
+        ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
+        break;
+      default:
+        ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
+    }
+  }
+  ret.objAttrs["classid"] = classid;
+  if (mimeType) ret.embedAttrs["type"] = mimeType;
+  return ret;
+}
+
+
Index: lams_flash/src/central/flex/GroupManager/html-template/index.template.html
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/html-template/index.template.html	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/html-template/index.template.html	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,121 @@
+<!-- saved from url=(0014)about:internet -->
+<html lang="en">
+
+<!-- 
+Smart developers always View Source. 
+
+This application was built using Adobe Flex, an open source framework
+for building rich Internet applications that get delivered via the
+Flash Player or to desktops via Adobe AIR. 
+
+Learn more about Flex at http://flex.org 
+// -->
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+<!--  BEGIN Browser History required section -->
+<link rel="stylesheet" type="text/css" href="history/history.css" />
+<!--  END Browser History required section -->
+
+<title>${title}</title>
+<script src="AC_OETags.js" language="javascript"></script>
+
+<!--  BEGIN Browser History required section -->
+<script src="history/history.js" language="javascript"></script>
+<!--  END Browser History required section -->
+
+<style>
+body { margin: 0px; overflow:hidden }
+</style>
+<script language="JavaScript" type="text/javascript">
+<!--
+// -----------------------------------------------------------------------------
+// Globals
+// Major version of Flash required
+var requiredMajorVersion = ${version_major};
+// Minor version of Flash required
+var requiredMinorVersion = ${version_minor};
+// Minor version of Flash required
+var requiredRevision = ${version_revision};
+// -----------------------------------------------------------------------------
+// -->
+</script>
+</head>
+
+<body scroll="no">
+<script language="JavaScript" type="text/javascript">
+<!--
+// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+var hasProductInstall = DetectFlashVer(6, 0, 65);
+
+// Version check based upon the values defined in globals
+var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+
+if ( hasProductInstall && !hasRequestedVersion ) {
+	// DO NOT MODIFY THE FOLLOWING FOUR LINES
+	// Location visited after installation is complete if installation is required
+	var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+	var MMredirectURL = window.location;
+    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+    var MMdoctitle = document.title;
+
+	AC_FL_RunContent(
+		"src", "playerProductInstall",
+		"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+"",
+		"width", "${width}",
+		"height", "${height}",
+		"align", "middle",
+		"id", "${application}",
+		"quality", "high",
+		"bgcolor", "${bgcolor}",
+		"name", "${application}",
+		"allowScriptAccess","sameDomain",
+		"type", "application/x-shockwave-flash",
+		"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+} else if (hasRequestedVersion) {
+	// if we've detected an acceptable version
+	// embed the Flash Content SWF when all tests are passed
+	AC_FL_RunContent(
+			"src", "${swf}",
+			"width", "${width}",
+			"height", "${height}",
+			"align", "middle",
+			"id", "${application}",
+			"quality", "high",
+			"bgcolor", "${bgcolor}",
+			"name", "${application}",
+			"allowScriptAccess","sameDomain",
+			"type", "application/x-shockwave-flash",
+			"pluginspage", "http://www.adobe.com/go/getflashplayer"
+	);
+  } else {  // flash is too old or we can't detect the plugin
+    var alternateContent = 'Alternate HTML content should be placed here. '
+  	+ 'This content requires the Adobe Flash Player. '
+   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+    document.write(alternateContent);  // insert non-flash content
+  }
+// -->
+</script>
+<noscript>
+  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+			id="${application}" width="${width}" height="${height}"
+			codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+			<param name="movie" value="${swf}.swf" />
+			<param name="quality" value="high" />
+			<param name="bgcolor" value="${bgcolor}" />
+			<param name="allowScriptAccess" value="sameDomain" />
+			<embed src="${swf}.swf" quality="high" bgcolor="${bgcolor}"
+				width="${width}" height="${height}" name="${application}" align="middle"
+				play="true"
+				loop="false"
+				quality="high"
+				allowScriptAccess="sameDomain"
+				type="application/x-shockwave-flash"
+				pluginspage="http://www.adobe.com/go/getflashplayer">
+			</embed>
+	</object>
+</noscript>
+</body>
+</html>
Index: lams_flash/src/central/flex/GroupManager/html-template/playerProductInstall.swf
===================================================================
diff -u
Binary files differ
Index: lams_flash/src/central/flex/GroupManager/src/ChangePanelTitlePopUp.mxml
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/src/ChangePanelTitlePopUp.mxml	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/src/ChangePanelTitlePopUp.mxml	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:TitleWindow xmlns:mx="http://www.adobe.com/2006/mxml" width="300" height="118" title="Change Group Name" creationComplete="initApp();">
+	<mx:Script>
+        <![CDATA[       
+            import mx.managers.PopUpManager;
+            import mx.containers.Panel;
+            import mx.controls.Alert;
+	       
+            private var existingPanel:Panel;
+		   	private var languageXML:XML;
+		   	
+		   	private function initApp():void{
+		   		this.focusManager.setFocus(newTitle_tin);
+		   	}
+		   	
+		   	public function init(x:int, y:int, title:String, panelToUse:Panel, languageXML:XML):void{
+		   		this.x = x;
+		   		this.y = y;
+		   		this.title = title;
+		   		this.existingPanel = panelToUse;
+		   		this.languageXML = languageXML;
+		   		
+		   		changeName_lbl.text = languageXML.language.entry.(@key=="label.grouping.popup.change.group.name.field").name;
+		   	}
+		   	
+            private function confirmUpdateTitle():void {
+                this.parentApplication.changePanelTitle(existingPanel, newTitle_tin.text);
+                PopUpManager.removePopUp(this);
+            }
+            
+            private function cancelUpdateTitle():void {
+            	PopUpManager.removePopUp(this);
+            }
+            
+        ]]>
+    </mx:Script>
+    <mx:VBox x="10" y="10" height="100%" width="100%">
+        <mx:HBox verticalAlign="middle" width="260">
+            <mx:Label id="changeName_lbl" />
+            <mx:TextInput id="newTitle_tin" width="100%" enter="confirmUpdateTitle();" />
+        </mx:HBox>
+        <mx:HBox width="260" height="30" verticalAlign="middle" horizontalAlign="right">
+            <mx:Button label="OK" click="confirmUpdateTitle();"/>
+            <mx:Button label="Cancel" click="cancelUpdateTitle();"/>
+        </mx:HBox>
+    </mx:VBox>
+</mx:TitleWindow>
Index: lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml
===================================================================
diff -u
--- lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml	(revision 0)
+++ lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -0,0 +1,632 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute" creationComplete="initApp();" width="793" height="454" backgroundGradientAlphas="[1.0, 1.0]" backgroundGradientColors="[#FFFFFF, #FFFFFF]">
+       
+    <!-- httpservices -->
+    <mx:HTTPService 
+        id="getGroupsService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="getGroupsSuccessHandler(event);"
+        fault="getGroupsFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>getGroups</method>
+            <activityID></activityID>
+        </mx:request>
+    </mx:HTTPService>
+
+    <mx:HTTPService 
+        id="getMembersNotGroupedService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="getMembersNotGroupedSuccessHandler(event);"
+        fault="getMembersNotGroupedFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>getClassMembersNotGrouped</method>
+            <activityID></activityID>
+            <lessonID></lessonID>
+        </mx:request>
+    </mx:HTTPService>
+    
+    <mx:HTTPService 
+        id="getGroupMembersService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="getGroupMembersSuccessHandler(event);"
+        fault="getGroupMembersFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>getGroupMembers</method>
+            <activityID></activityID>
+            <groupID></groupID>
+        </mx:request>
+    </mx:HTTPService>
+    
+    <mx:HTTPService 
+        id="addMembersService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="addMembersSuccessHandler(event);"
+        fault="addMembersFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>addMembers</method>
+            <activityID></activityID>
+            <groupID></groupID>
+            <members></members>
+        </mx:request>
+    </mx:HTTPService>
+    
+    <mx:HTTPService 
+        id="removeMembersService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="removeMembersSuccessHandler(event);"
+        fault="removeMembersFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>removeMembers</method>
+            <activityID></activityID>
+            <groupID></groupID>
+            <members></members>
+        </mx:request>
+    </mx:HTTPService>
+ 
+    <mx:HTTPService 
+        id="addGroupService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="addGroupSuccessHandler(event);"
+        fault="addGroupFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>addGroup</method>
+            <activityID></activityID>
+            <name></name>
+        </mx:request>
+    </mx:HTTPService>
+
+    <mx:HTTPService 
+        id="removeGroupService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="removeGroupSuccessHandler(event);"
+        fault="removeGroupFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>removeGroup</method>
+            <activityID></activityID>
+            <groupID></groupID>
+        </mx:request>
+    </mx:HTTPService>
+
+    <mx:HTTPService 
+        id="changeGroupNameService"
+        url="http://172.20.100.220:8080/lams/monitoring/grouping.do"
+        method="POST"
+        resultFormat="xml"
+        result="changeGroupNameSuccessHandler(event);"
+        fault="changeGroupNameFaultHandler(event);">
+        
+        <mx:request xmlns="">
+            <method>changeGroupName</method>
+            <groupID></groupID>
+            <name></name>
+        </mx:request>
+    </mx:HTTPService>
+        
+    <mx:Script>
+		<![CDATA[
+			//imports
+			import mx.events.CloseEvent;
+			import mx.events.DropdownEvent;
+			import mx.events.DragEvent;
+			import mx.collections.XMLListCollection;
+			import mx.core.UITextField;
+			import mx.rpc.events.ResultEvent;
+			import mx.controls.Spacer;
+			import mx.controls.Button;
+			import mx.containers.ControlBar;
+			import mx.controls.dataGridClasses.DataGridColumn;
+			import mx.collections.ArrayCollection;
+			import mx.containers.Panel;
+			import mx.controls.DataGrid;
+			import mx.controls.Alert;
+			import mx.managers.PopUpManager;
+			import mx.containers.TitleWindow;
+			import flash.text.TextField;
+			
+			// collection of panels
+			private var panels:ArrayCollection = new ArrayCollection();
+			
+			// collection of panels respective dataproviders (also collections)
+			private var panelLearnerDataProviders:ArrayCollection = new ArrayCollection();
+			
+			// initial learners collection (used by global datagrid)
+			private var intialLearners:ArrayCollection = new ArrayCollection();
+			
+			// total number of groups add (even after removal)
+			private var totalGroupsAdded:int = 0;
+			
+			// last remove event stored
+			private var lastRemoveEvent:Event;
+			
+			// variables grabbed from flashvars
+			private var lessonID:int;
+			private var activityID:int;
+			private var serverUrl:String;
+			private var usedForBranching:Boolean;
+			private var mayDelete:Boolean;
+			private var maxNumberOfGroups:int;
+			private var languageXML:XML;
+			private var viewMode:Boolean;
+			
+			// constants
+			private const SERVLET_PATH:String = "monitoring/grouping.do";
+			
+			// initializes application
+			private function initApp():void {
+				// get flashvars
+				lessonID = Application.application.parameters.lessonID;
+				activityID = Application.application.parameters.activityID;
+				serverUrl = Application.application.parameters.serverUrl;
+				usedForBranching = stringToBool(Application.application.parameters.usedForBranching);
+				mayDelete = stringToBool(Application.application.parameters.mayDelete);
+				maxNumberOfGroups = Application.application.parameters.maxNumberOfGroups;
+				languageXML = XML(Application.application.parameters.languageXML);
+				viewMode = stringToBool(Application.application.parameters.viewMode);
+				
+				// initialize misc. stuff including events
+				mainDataGrid_dg.dataProvider = intialLearners;
+				mainDataGrid_dg.addEventListener(DragEvent.DRAG_DROP, dragDropHandler);
+				globalAddPanel_btn.addEventListener(MouseEvent.CLICK, addPanelHandler);
+				globalRemovePanel_btn.addEventListener(MouseEvent.CLICK, removePanelHandler);
+				finish_btn.addEventListener(MouseEvent.CLICK, closeWindowHandler);	
+				
+				// if flashvars from jsp are missing
+				if(lessonID == 0 || activityID == 0 || serverUrl == "" || languageXML == null) {
+					Alert.show("Error occured: flashvars not initialized");
+					application.enabled = false;
+				}
+				else {
+					initServices();
+					initButtonsAndDragging();
+					initLabels();
+					getMembersNotGroupedService.send();
+					getGroupsService.send();
+				}
+			}
+			
+			// initialize labels from language xml
+			private function initLabels():void{
+				groupFunctions_lbl.text = languageXML.language.entry.(@key=="label.grouping.functions").name;
+				finish_btn.label = languageXML.language.entry.(@key=="button.finished").name;
+				mainDataGridCol1_col.headerText = languageXML.language.entry.(@key=="label.grouping.non.grouped.users.heading").name;
+				status_lbl.text = languageXML.language.entry.(@key=="label.grouping.status").name;
+				globalAddPanel_btn.label = "+";
+				globalRemovePanel_btn.label = "-";
+			}
+			
+			// initialize buttons and dragging depending on jsp conditions
+			private function initButtonsAndDragging():void {
+				// allow movement of students if deleting is allowed
+				mainDataGrid_dg.dragEnabled = mayDelete;
+				mainDataGrid_dg.dropEnabled = mayDelete;
+				mainDataGrid_dg.dragMoveEnabled = mayDelete;
+				mainDataGrid_dg.allowDragSelection = mayDelete;
+				
+				// if groups are being used for branching, if deletion is a nono or if branching/grouping is in view mode, disable add and remove buttons
+				if(usedForBranching || !mayDelete || viewMode) {
+					globalAddPanel_btn.enabled = false;
+					globalRemovePanel_btn.enabled = false;
+				}
+				// otherwise, active the buttons
+				else {
+					globalAddPanel_btn.enabled = true;
+					globalRemovePanel_btn.enabled = true;
+				}
+			}
+			
+			// set request parameters
+			private function initServices():void {
+				getGroupsService.url = serverUrl + SERVLET_PATH;
+				getMembersNotGroupedService.url = serverUrl + SERVLET_PATH;
+				getGroupMembersService.url = serverUrl + SERVLET_PATH;
+				addMembersService.url = serverUrl + SERVLET_PATH;
+				removeMembersService.url = serverUrl + SERVLET_PATH;
+				addGroupService.url = serverUrl + SERVLET_PATH;
+				removeGroupService.url = serverUrl + SERVLET_PATH;
+				changeGroupNameService.url = serverUrl + SERVLET_PATH;
+				
+				getGroupsService.request.activityID = activityID;
+				
+				getMembersNotGroupedService.request.activityID = activityID;
+				getMembersNotGroupedService.request.lessonID = lessonID;
+				
+				getGroupMembersService.request.activityID = activityID;
+				
+				addMembersService.request.activityID = activityID;
+				
+				removeMembersService.request.activityID = activityID;
+				
+				addGroupService.request.activityID = activityID;
+				removeGroupService.request.activityID = activityID;
+			}
+			
+			
+			// adds a new group panel
+			private function addGroupPanel(id:String = null, title:String = null):Boolean {
+				// create components
+                var newPanel:Panel = new Panel();
+                var newControlBar:ControlBar = new ControlBar();
+               	var newDataGrid:DataGrid = new DataGrid();
+               	var newLearnersCollection:ArrayCollection = new ArrayCollection([]);
+               	var newDataGridColumn:DataGridColumn = new DataGridColumn();
+               	var newPanelRemoveButton:Button = new Button();
+				var horizontalSpacer:Spacer = new Spacer();
+				
+				// increment total number of group panels added
+				totalGroupsAdded++;
+				
+               	// push new group panel and its dataprovider into their respective collections
+               	panels.addItem(newPanel);
+               	panelLearnerDataProviders.addItem(newLearnersCollection);
+
+             	// set new panelRemove button attributes
+             	newPanelRemoveButton.label = "-";
+             	newPanelRemoveButton.id = "panelRemove_btn";
+             	newPanelRemoveButton.addEventListener(MouseEvent.CLICK, removePanelHandler);
+             	
+             	// set spacer attributes
+             	horizontalSpacer.percentWidth = 100;
+             	
+             	// set new controlbar attributes
+             	newControlBar.percentWidth = 100;
+             	newControlBar.height = 40;
+             	
+             	// add only if conditions are alright
+             	if(!usedForBranching && mayDelete && !viewMode) {
+             		newControlBar.addChild(horizontalSpacer);
+             		newControlBar.addChild(newPanelRemoveButton);
+             	}
+
+             	// set new panel attributes
+                newPanel.width = learnerGroups_tile.width / 2 - 15;
+                newPanel.height = learnerGroups_tile.height / 2 - 6;
+                newPanel.addEventListener(MouseEvent.CLICK, changePanelTitleHandler);
+                
+                if(id == null){
+ 					newPanel.id = "group" + String(totalGroupsAdded) + "Learners_pnl";            
+               	}
+               	else {
+               		newPanel.id = id;
+               	}
+               	    
+                if(title == null){
+ 					newPanel.title = "Group " + String(totalGroupsAdded);               
+               	}
+               	else {
+               		newPanel.title = title;
+               	}
+
+				// set new column attributes
+				newDataGridColumn.headerText = languageXML.language.entry.(@key=="label.grouping.learners").name;
+				newDataGridColumn.dataField = "displayName";
+				
+				// set new datagrid attributes
+               	newDataGrid.columns = [newDataGridColumn];
+               	newDataGrid.percentWidth = 100;
+               	newDataGrid.percentHeight = 100;
+               	newDataGrid.allowMultipleSelection = true;
+               	newDataGrid.addEventListener(DragEvent.DRAG_DROP, dragDropHandler);
+               	newDataGrid.dataProvider = newLearnersCollection;
+				
+				newDataGrid.dropEnabled = mayDelete;
+               	newDataGrid.dragEnabled = mayDelete;
+               	newDataGrid.dragMoveEnabled= mayDelete;
+               	newDataGrid.allowDragSelection = mayDelete;
+               	
+				// add elements to the panel
+				newPanel.addChild(newDataGrid);
+				newPanel.addChild(newControlBar);
+				
+				// add the panel to the tile
+				learnerGroups_tile.addChild(newPanel);
+				
+				return true;
+			}
+			
+			// removes a given group panel
+			private function removeGroupPanel(groupId:int):Boolean{
+				// there must be at least one panel
+				if(panels.length != 0) {
+					// the given panel must be in the collection
+					if(groupId < panels.length && groupId >= 0) {
+						// get panel information
+						var lastGroupLearners:ArrayCollection = panelLearnerDataProviders[groupId];
+						var lastGroupPanel:Panel = panels[groupId];
+						
+						// get learners to move back to initial grid
+		        		var selectedNamesString:String = "";
+		        	
+		        		// format the learner ids as needed serverside
+		        		for(var i:int = 0; i < lastGroupLearners.length; i++){
+		        			selectedNamesString += lastGroupLearners[i].id;
+		        		
+			        		if(i < lastGroupLearners.length - 1)
+			        		{
+			        			selectedNamesString += ",";
+			        		}
+		        		}
+		        	
+						// add learners back to server
+						removeMembersService.request.groupID = lastGroupPanel.id;	
+						removeMembersService.request.members = selectedNamesString;
+						removeMembersService.send();
+						
+						// add learners back to main datagrid
+						for(var i:int = 0; i < lastGroupLearners.length; i++) {
+							intialLearners.addItem(lastGroupLearners[i]);
+						}
+						
+						// remove group from tile
+						learnerGroups_tile.removeChild(lastGroupPanel);
+						
+						// remove panel and its dataprovider from their respective collections
+						panelLearnerDataProviders.removeItemAt(groupId);
+						panels.removeItemAt(groupId);
+						
+						return true;
+					}
+				}
+				return false;
+			}
+			
+			// click handler for changing a panel's title
+	        private function changePanelTitleHandler(e:Event):void {
+	            if(panels.contains(e.currentTarget) && e.target is UITextField && e.target.text == e.currentTarget.title){
+	            	createChangePanelTitleWindow(Panel(e.currentTarget));
+	            }
+	        }
+	        
+	        // method for creating new panel title change popups
+	       	private function createChangePanelTitleWindow(clickedPanel:Panel):void{
+	        	var popup:ChangePanelTitlePopUp = ChangePanelTitlePopUp(PopUpManager.createPopUp(this, ChangePanelTitlePopUp, true));
+				popup.init(application.width / 2 - popup.width / 2, application.height / 2 - popup.height / 2, languageXML.language.entry.(@key=="label.grouping.popup.change.group.name").name, clickedPanel, languageXML);
+	        }
+	        
+	        // call the change panel name service
+	        public function changePanelTitle(panel:Panel, title:String):void {
+	        	changeGroupNameService.request.groupID = panel.id;
+	        	changeGroupNameService.request.name = title;
+	        	changeGroupNameService.send();
+	        }
+	        
+	        // find a panel index from its groupID
+	        private function findPanelIndex(groupID:int):int{
+	        	for(var i:int = 0; i < panels.length; i++) {
+	     			if(Panel(panels[i]).id == String(groupID)){
+						return i;
+	     			}
+	     		}
+	     		
+	     		return -1;
+	        }
+	        
+	        // convert a string to a boolean
+	        private function stringToBool(string:String):Boolean{
+	        	switch(string){
+	        		case "1":
+	        		case "true":
+	        		case "yes":
+	        			return true;
+	        		case "0":
+	        		case "false":
+	        		case "no":
+	        			return false;
+	        		default:
+	        		return Boolean(string);
+	        	}
+	        }
+	        
+	        // click handler for adding a panel
+	        private function addPanelHandler(e:Event):void {
+	        	addGroupService.request.name = "Group " + String(totalGroupsAdded + 1);
+				addGroupService.send();
+	        }
+	        
+	        // click handler for removing a panel
+            private function removePanelHandler(event:Event):void {
+            	if(panels.length != 0) {
+	            	lastRemoveEvent = event;
+	                Alert.show(languageXML.language.entry.(@key=="label.grouping.popup.delete.group.message").name, languageXML.language.entry.(@key=="label.grouping.popup.delete.group").name, 3, this, alertClickHandler);    	
+            	}
+            }
+            
+            // click handler to confirm removing a panel
+            private function alertClickHandler(event:CloseEvent):void {
+                if (event.detail==Alert.YES){
+                	removePanelHandlerComplete(lastRemoveEvent);
+                }
+            }
+            
+	        // handler to complete removing a panel
+	        private function removePanelHandlerComplete(e:Event):void {
+				if(e.target.id == "panelRemove_btn" && panels.contains(e.target.parent.parent)){
+	            	removeGroupService.request.groupID = e.target.parent.parent.id;
+	            	removeGroupService.send();
+	            }
+	            else if(e.target == globalRemovePanel_btn){
+	            	removeGroupService.request.groupID = Panel(panels.getItemAt(panels.length-1)).id;
+	            	removeGroupService.send();
+	            }
+	        }
+	        
+	        // click handler for the finish button
+	        private function closeWindowHandler(e:MouseEvent):void{
+	        	ExternalInterface.call("closeWindow");
+	        }
+	        
+	        // drag drop handler
+	        private function dragDropHandler(e:DragEvent):void {
+	        	// if the drag and drop source and destination are not the same
+	        	if(e.dragInitiator != e.currentTarget){
+	        		// get selected items in datagrid
+		        	var selectedNames:Array = DataGrid(e.dragInitiator).selectedItems;
+		        	var selectedNamesString:String = "";
+		        	
+		        	// format the learner ids as needed serverside
+		        	for(var i:int = 0; i < selectedNames.length; i++){
+		        		selectedNamesString += selectedNames[i].id;
+		        		
+		        		if(i < selectedNames.length - 1)
+		        		{
+		        			selectedNamesString += ",";
+		        		}
+		        	}
+					
+					// if the source is not the initial learners grid, remove members
+					if(DataGrid(e.dragInitiator).id != "mainDataGrid_dg") {
+						removeMembersService.request.groupID = Panel(e.dragInitiator.parent).id;
+						removeMembersService.request.members = selectedNamesString;
+						removeMembersService.send();
+					}
+					
+					// if the destination is not the initial learners grid, add members
+					if(DataGrid(e.currentTarget).id != "mainDataGrid_dg") {
+			        	addMembersService.request.groupID = Panel(e.currentTarget.parent).id;
+			        	addMembersService.request.members = selectedNamesString;
+			        	addMembersService.send();
+					}
+	        	}
+	        }
+	        
+	        // -- httpservice handlers --
+	        private function getGroupsSuccessHandler(e:ResultEvent):void {
+	        	var xmlResult:XMLListCollection = new XMLListCollection(XMLList(e.result).groups.group);
+	        	
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+					addGroupPanel(xmlResult.getItemAt(i).id.toString(), xmlResult.getItemAt(i).name.toString());
+	        	}
+	        	
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+	        		getGroupMembersService.request.groupID = xmlResult.getItemAt(i).id.toString();
+	        		getGroupMembersService.send();
+	        	}
+	        }
+	        
+	      	private function getGroupsFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	       
+	        private function getMembersNotGroupedSuccessHandler(e:ResultEvent):void {
+	        	var xmlResult:XMLListCollection = new XMLListCollection(XMLList(e.result).users.user);
+	        	var groupID:int = XMLList(e.result).groupID.toString();
+	     
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+	        		intialLearners.addItem({displayName: xmlResult.getItemAt(i).displayName.toString(), id: xmlResult.getItemAt(i).id.toString()});
+	        	}
+	        }
+	        
+	      	private function getMembersNotGroupedFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function getGroupMembersSuccessHandler(e:ResultEvent):void {
+	        	var xmlResult:XMLListCollection = new XMLListCollection(XMLList(e.result).users.user);
+	        	var groupID:int = XMLList(e.result).groupID.toString();
+	     		var indexToUse:int = findPanelIndex(groupID);
+	     		
+	        	for(var i:int = 0; i < xmlResult.length; i++){
+	        		panelLearnerDataProviders[indexToUse].addItem({displayName: xmlResult.getItemAt(i).displayName.toString(), id: xmlResult.getItemAt(i).id.toString()});
+	        	}
+	        }
+	        
+	      	private function getGroupMembersFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function addMembersSuccessHandler(e:ResultEvent):void {
+	        	// nothing to do here
+	        }
+	        
+	      	private function addMembersFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function removeMembersSuccessHandler(e:ResultEvent):void {
+	        	// nothing to do here
+	        }
+	        
+	      	private function removeMembersFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function addGroupSuccessHandler(e:ResultEvent):void {
+	        	addGroupPanel(XMLList(e.result).group.id.toString()), XMLList(e.result).group.name.toString();
+	        }
+	        
+	      	private function addGroupFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        private function removeGroupSuccessHandler(e:ResultEvent):void {
+	        	var groupID:int = XMLList(e.result).group.id.toString();
+	        	var indexToUse:int = findPanelIndex(groupID);
+	        
+	     		removeGroupPanel(indexToUse);
+	        }
+	        
+	      	private function removeGroupFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	      	}
+	      	
+	      	private function changeGroupNameSuccessHandler(e:ResultEvent):void {
+	        	var groupID:int = XMLList(e.result).group.id.toString();
+	        	var groupName:String = XMLList(e.result).group.newName.toString();
+	        	var indexToUse:int = findPanelIndex(groupID);
+	        	
+	        	Panel(panels.getItemAt(indexToUse)).title = groupName;
+	        }
+	        
+	      	private function changeGroupNameFaultHandler(e:Event):void {
+	      		Alert.show(languageXML.language.entry.(@key=="error.title").name);
+	        }
+	        
+	        // -- getters and setters --
+	        
+	        public function getLanguageXML():XML{
+	        	return languageXML;
+	        }
+		]]>
+	</mx:Script>
+
+	<mx:DataGrid id="mainDataGrid_dg" width="185" dragEnabled="true" dropEnabled="true" dragMoveEnabled="true" allowMultipleSelection="true" allowDragSelection="true" left="10" top="10" bottom="10">
+		<mx:columns>
+			<mx:DataGridColumn id="mainDataGridCol1_col" dataField="displayName"/>
+		</mx:columns>
+	</mx:DataGrid>
+	<mx:Tile verticalScrollPolicy="auto" id="learnerGroups_tile" right="10" top="10" bottom="48" left="203">
+	</mx:Tile>
+	<mx:HBox verticalAlign="middle" bottom="10" right="10" height="30" left="203">
+		<mx:Label id="groupFunctions_lbl"/>
+		<mx:Button id="globalAddPanel_btn" />
+		<mx:Button id="globalRemovePanel_btn" />
+		<mx:Label id="status_lbl"/>
+		<mx:SWFLoader source="../bin-debug/loading_small.swf" autoLoad="true" id="working_swf" visible="false"/>
+		<mx:Spacer width="100%"/>
+		<mx:Button id="finish_btn"/>
+		<mx:SWFLoader visible="false">
+			<mx:source>../bin-debug/loading_small.swf</mx:source>
+		</mx:SWFLoader>
+	</mx:HBox>
+	
+</mx:Application>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
diff -u -r2adb095d59ae592387e0a701f5bf9728281684d0 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision 2adb095d59ae592387e0a701f5bf9728281684d0)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -33,6 +33,7 @@
 	>
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
 		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="groupDAO"><ref bean="groupDAO"/></property>
 		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
 		<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>	
 		<property name="authoringService"><ref bean="authoringService"/></property>	
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
diff -u -rd52c700f83126a2632c10012bf2c8f1bceed3516 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision d52c700f83126a2632c10012bf2c8f1bceed3516)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(.../IMonitoringService.java)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -804,4 +804,9 @@
      * Start multiple lessons in one call.
      */
     public boolean startLessons(Integer creatorUserId, String lessonPacket) throws Exception;
+    
+    /**
+     * Set a groups name
+     */
+	public void setGroupName(Long groupID, String name);
 }
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r778247c607dc8d767ddbc3dff25d0a3505d00661 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision 778247c607dc8d767ddbc3dff25d0a3505d00661)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -60,6 +60,7 @@
 import org.lamsfoundation.lams.learningdesign.SequenceActivity;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
+import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO;
 import org.lamsfoundation.lams.learningdesign.dao.ILearningDesignDAO;
 import org.lamsfoundation.lams.learningdesign.dao.ITransitionDAO;
@@ -153,6 +154,8 @@
     private ILearningDesignDAO learningDesignDAO;
 
     private IGroupingDAO groupingDAO;
+    
+    private IGroupDAO groupDAO;
 
     private ILearnerProgressDAO learnerProgressDAO;
 
@@ -2740,5 +2743,13 @@
 	    throw new Exception(e);
 	}
     }
-
+    
+    /**
+     * Set a group's name
+     */
+	public void setGroupName(Long groupID, String name) {
+		Group group = groupDAO.getGroupById(groupID);
+		group.setGroupName(name);
+		groupDAO.saveGroup(group);
+	}
 }
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java
===================================================================
diff -u -reb02d23e4734503baf51538aefd7e345b0c45ec4 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java	(.../BranchingAction.java)	(revision eb02d23e4734503baf51538aefd7e345b0c45ec4)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java	(.../BranchingAction.java)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.monitoring.web;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -49,6 +50,7 @@
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
 import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -70,11 +72,15 @@
 
     //---------------------------------------------------------------------
 
-	private static final String VIEW_BRANCHES_SCREEN = "viewBranches";
+	protected static final String VIEW_BRANCHES_SCREEN = "viewBranches";
+	protected static final String CHOSEN_SELECTION_SCREEN = "chosenSelection";
 	public static final String PARAM_BRANCHING_DTO = "branching";
 	public static final String PARAM_SHOW_GROUP_NAME = "showGroupName";
 	/** If localFiles = true will be written to a local file for export portfolio */
-	public static final String PARAM_LOCAL_FILES= "localFiles"; 
+	public static final String PARAM_LOCAL_FILES= "localFiles";
+	public static final String PARAM_MAY_DELETE = "mayDelete";
+	public static final String PARAM_MODULE_LANGUAGE_XML = "languageXML";
+	protected static final String PARAM_VIEW_MODE = "viewMode";
 	
    /**
      * Export Portfolio Page
@@ -119,6 +125,9 @@
 		request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
 		request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
 		request.setAttribute(PARAM_LOCAL_FILES, useLocalFiles);
+		request.setAttribute(PARAM_MODULE_LANGUAGE_XML, getLanguageXML());
+		request.setAttribute(PARAM_MAY_DELETE, Boolean.FALSE);
+		request.setAttribute(PARAM_VIEW_MODE, Boolean.TRUE);
 	    	
 		// only show the group names if this is a group based branching activity - the names
 		// are meaningless for chosen and tool based branching
@@ -128,7 +137,7 @@
 		if ( log.isDebugEnabled() ) {
 			log.debug("viewBranching: Branching activity "+dto);
 		}
-		return mapping.findForward(VIEW_BRANCHES_SCREEN);
+		return mapping.findForward(CHOSEN_SELECTION_SCREEN);
 	}
     	
 	// Can't do this in BranchingDTO (although that's where it should be) as we have
@@ -170,6 +179,29 @@
 		dto.setBranches(branches);
 		return dto;
 	}
+	
+	/**
+	 * @return String of xml with all needed language elements
+	 */ 
+	protected String getLanguageXML(){
+		IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
+		MessageService messageService = monitoringService.getMessageService();
+		ArrayList<String> languageCollection = new ArrayList<String>();
+		languageCollection.add(new String("button.finished"));
+		languageCollection.add(new String("label.branching.non.allocated.users.heading"));
+		languageCollection.add(new String("label.grouping.status"));
+		languageCollection.add(new String("label.grouping.learners"));
+		languageCollection.add(new String("error.title"));
+		
+		String languageOutput = "<xml><language>";
+		
+		for(int i = 0; i < languageCollection.size(); i++){
+			languageOutput += "<entry key='" + languageCollection.get(i) + "'><name>" + messageService.getMessage(languageCollection.get(i)) + "</name></entry>";
+		}
+		
+		languageOutput += "</language></xml>";
+		
+		return languageOutput;
+	}
 
-
  }
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
===================================================================
diff -u -r08be5501aa8570c5fa4c6e50aa615334c171ee58 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(.../ChosenBranchingAJAXAction.java)	(revision 08be5501aa8570c5fa4c6e50aa615334c171ee58)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java	(.../ChosenBranchingAJAXAction.java)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.monitoring.web;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -45,6 +46,7 @@
 import org.lamsfoundation.lams.monitoring.service.MonitoringServiceProxy;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
@@ -70,9 +72,7 @@
 
     //---------------------------------------------------------------------
 
-	private static final String CHOSEN_SELECTION_SCREEN = "chosenSelection";
 	public static final String PARAM_BRANCH_ID = "branchID";
-	public static final String PARAM_MAY_DELETE = "mayDelete";
 	public static final String PARAM_MEMBERS = "members";
 	
 	/** 
@@ -86,6 +86,7 @@
 
     	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
         Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+        
 
         IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
     	BranchingActivity activity = (BranchingActivity) monitoringService.getActivityById(activityID, BranchingActivity.class);
@@ -97,6 +98,8 @@
 			request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activityID);
 			request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
 			request.setAttribute(AttributeNames.PARAM_TITLE, activity.getTitle());
+			request.setAttribute(PARAM_MODULE_LANGUAGE_XML, getLanguageXML());
+			request.setAttribute(PARAM_VIEW_MODE, Boolean.FALSE);
 
 			// can we still move users? 
 			boolean usersStartedBranching = monitoringService.isActivityAttempted(activity); 
@@ -133,30 +136,8 @@
 
 		// build the output string to return to the chosen branching page.
 		// there should only ever be one group for each branch in chosen branching
-		String branchesOutput = "";
+		String branchesOutput = buildBranchStringXML(sortedBranches, monitoringService);
 
-		boolean first = true;
-		for ( Activity childActivity : sortedBranches ) {
-
-			SequenceActivity branch = (SequenceActivity) monitoringService.getActivityById(childActivity.getActivityId(), SequenceActivity.class);
-
-			Long branchId = branch.getActivityId();
-			String name = branch.getTitle();
-			int numberOfMembers = 0;
-
-			Group group = branch.getSoleGroupForBranch();
-			if ( group != null )
-				numberOfMembers = group.getUsers().size();
-
-			if ( ! first ) {
-				branchesOutput=branchesOutput+";";
-			} else {
-				first = false;
-			}
-
-			branchesOutput=branchesOutput+branchId+","+name+","+numberOfMembers;
-		}
-
 		if ( log.isDebugEnabled() ) {
 			log.debug("getBranches activity id "+activityID+" returning "+branchesOutput);
 		}
@@ -181,7 +162,7 @@
 		Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 		IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
 		SortedSet<User> users = monitoringService.getClassMembersNotGrouped(lessonID, activityID, false);
-		String groupOutput = buildUserString(users);
+		String groupOutput = buildUserStringXML(-1, users);
 		writeAJAXResponse(response, groupOutput);
 		return null;
 		
@@ -208,7 +189,7 @@
 		if ( group != null ) {
 			SortedSet<User> sortedUsers = new TreeSet<User>(new LastNameAlphabeticComparator());
 			sortedUsers.addAll(group.getUsers());
-			userOutput = buildUserString(sortedUsers);
+			userOutput = buildUserStringXML(branchID, sortedUsers);
 		}
 		
 		if ( log.isDebugEnabled() ) {
@@ -241,7 +222,98 @@
 		}
 		return userOutput;
 	}
+
+	/**
+	 *  Output format: xml
+	 * @param branchId
+	 * @param sortedUsers
+	 * @return String of users
+	 */ 
+	private String buildUserStringXML(long branchId, SortedSet<User> sortedUsers) {
+		String userOutput = "<xml>";
+		userOutput += "<branchID>" + branchId + "</branchID>";
+		userOutput += "<users>";
+		for ( User user : sortedUsers ) {
+			Integer userID = user.getUserId();
+			String lastName = user.getLastName();
+			String firstName = user.getFirstName();
 	
+			userOutput+="<user>";
+			userOutput+="<id>" + userID + "</id>";
+			userOutput+="<firstName>" + firstName + "</firstName>";
+			userOutput+="<lastName>" + lastName + "</lastName>";
+			userOutput+="<displayName>" + firstName + " " + lastName + "</displayName>";
+			userOutput+="</user>";
+		}
+		userOutput += "</users></xml>";
+		return userOutput;
+	}
+
+	/**
+	 *  Output format:
+	 * @param TreeSet<Activity> sortedBranches
+	 * @param IMonitoringService monitoringService
+	 * @return String of branches in some strange format
+	 */ 
+	private String buildBranchString(TreeSet<Activity> sortedBranches, IMonitoringService monitoringService){
+		String branchesOutput = "";
+
+		boolean first = true;
+		for ( Activity childActivity : sortedBranches ) {
+
+			SequenceActivity branch = (SequenceActivity) monitoringService.getActivityById(childActivity.getActivityId(), SequenceActivity.class);
+
+			Long branchId = branch.getActivityId();
+			String name = branch.getTitle();
+			int numberOfMembers = 0;
+
+			Group group = branch.getSoleGroupForBranch();
+			if ( group != null )
+				numberOfMembers = group.getUsers().size();
+
+			if ( ! first ) {
+				branchesOutput=branchesOutput+";";
+			} else {
+				first = false;
+			}
+
+			branchesOutput=branchesOutput+branchId+","+name+","+numberOfMembers;
+		}
+		
+		return branchesOutput;
+	}
+	
+	/**
+	 *  Output format: xml
+	 * @param TreeSet<Activity> sortedBranches
+	 * @param IMonitoringService monitoringService
+	 * @return String of branches in xml format
+	 */ 
+	private String buildBranchStringXML(TreeSet<Activity> sortedBranches, IMonitoringService monitoringService){
+		String branchOutput = "<xml><branches>";
+		for (Activity childActivity : sortedBranches) {
+
+			SequenceActivity branch = (SequenceActivity) monitoringService.getActivityById(childActivity.getActivityId(), SequenceActivity.class);
+
+			Long branchId = branch.getActivityId();
+			String name = branch.getTitle();
+			int numberOfMembers = 0;
+
+			Group group = branch.getSoleGroupForBranch();
+			if ( group != null )
+				numberOfMembers = group.getUsers().size();
+			
+			branchOutput+="<branch>";
+			branchOutput+="<id>" + branchId + "</id>";
+			branchOutput+="<name>" + name + "</name>";
+			branchOutput+="<numberOfMembers>" + numberOfMembers + "</numberOfMembers>";
+			branchOutput+="</branch>";
+		}
+		branchOutput += "</branches></xml>";
+		
+		return branchOutput;
+	}
+	
 	/** 
 	 * Add learners to a group. Designed to respond to an AJAX call.
      *
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
===================================================================
diff -u -r4817e3da1eb7dc61568fc813da2eb0cf383aec46 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(.../GroupingAJAXAction.java)	(revision 4817e3da1eb7dc61568fc813da2eb0cf383aec46)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(.../GroupingAJAXAction.java)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -26,6 +26,8 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.SortedSet;
@@ -53,6 +55,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -91,6 +94,8 @@
 	public static final String PARAM_MEMBERS = "members";
 	public static final String PARAM_MAY_DELETE = "mayDelete";
 	public static final String PARAM_USED_FOR_BRANCHING = "usedForBranching";
+	public static final String PARAM_MODULE_LANGUAGE_XML = "languageXML";
+	public static final String PARAM_VIEW_MODE = "viewMode";
 	
 	private Integer getUserId(HttpServletRequest request) {
 		HttpSession ss = SessionManager.getSession();
@@ -128,11 +133,12 @@
 			log.error(error);
 			throw new MonitoringServiceException(error);
 		}
-
+		
 		request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activityID);
 		request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
 		request.setAttribute(PARAM_ACTIVITY_TITLE, activity.getTitle());
 		request.setAttribute(PARAM_ACTIVITY_DESCRIPTION, activity.getDescription());
+		request.setAttribute(PARAM_MODULE_LANGUAGE_XML, getLanguageXML());
 		
 		if ( grouping.isChosenGrouping() ) {
 			// can I remove groups/users - can't if tool sessions have been created
@@ -153,15 +159,15 @@
 			request.setAttribute(PARAM_MAY_DELETE, mayDelete);
 			request.setAttribute(PARAM_USED_FOR_BRANCHING, usedForBranching);
 			request.setAttribute(PARAM_MAX_NUM_GROUPS, grouping.getMaxNumberOfGroups());
+			request.setAttribute(PARAM_VIEW_MODE, Boolean.FALSE);
 
 			return mapping.findForward(CHOSEN_GROUPING_SCREEN);
 			
 		} else {
 			
 			// go to a view only screen for random grouping
-	        SortedSet groups = new TreeSet(new GroupComparator());
-	        groups.addAll(grouping.getGroups());
-	        request.setAttribute(PARAM_GROUPS,groups);
+			request.setAttribute(PARAM_MAY_DELETE, Boolean.FALSE);
+			request.setAttribute(PARAM_VIEW_MODE, Boolean.TRUE);
 			return mapping.findForward(VIEW_GROUPS_SCREEN);
 		}
     	
@@ -185,21 +191,8 @@
     	Grouping grouping = getGrouping(activity);
 		Set<Group> sortedGroups = new TreeSet<Group>(new GroupComparator());
 		sortedGroups.addAll(grouping.getGroups());
-
-		// build the output string to return to the chosen grouping page.
-		String groupOutput = "";
-		boolean first = true;
-		for ( Group group: sortedGroups ) {
-			Long groupId = group.getGroupId();
-			String name = group.getGroupName();
-			Integer numberOfMembers = group.getUsers().size();
-			if ( ! first ) {
-				groupOutput=groupOutput+";";
-			} else {
-				first = false;
-			}
-			groupOutput=groupOutput+groupId+","+name+","+numberOfMembers;
-		}
+		
+		String groupOutput = buildGroupsStringXML(sortedGroups);
 		writeAJAXResponse(response, groupOutput);
 		return null;
 	}
@@ -220,7 +213,7 @@
 		Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 		IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
 		SortedSet<User> users = monitoringService.getClassMembersNotGrouped(lessonID, activityID, true);
-		String groupOutput = buildUserString(users);
+		String groupOutput = buildUserStringXML(-1 ,users);
 		writeAJAXResponse(response, groupOutput);
 		return null;
 		
@@ -261,7 +254,7 @@
 		Set users = group.getUsers();
 		SortedSet<User> sortedUsers = new TreeSet<User>(new LastNameAlphabeticComparator());
 		sortedUsers.addAll(users);
-		String userOutput = buildUserString(sortedUsers);
+		String userOutput = buildUserStringXML(groupID, sortedUsers);
 		writeAJAXResponse(response, userOutput);
 		return null;
 	}
@@ -289,6 +282,144 @@
 		return userOutput;
 	}
 	
+	/**
+	 * @param sortedUsers
+	 * @return String of users
+	 */ 
+	private String buildUserStringXML(long groupId, SortedSet<User> sortedUsers) {
+		String userOutput = "<xml>";
+		userOutput += "<groupID>" + groupId + "</groupID>";
+		userOutput += "<users>";
+		for ( User user : sortedUsers ) {
+			Integer userID = user.getUserId();
+			String lastName = user.getLastName();
+			String firstName = user.getFirstName();
+	
+			userOutput+="<user>";
+			userOutput+="<id>" + userID + "</id>";
+			userOutput+="<firstName>" + firstName + "</firstName>";
+			userOutput+="<lastName>" + lastName + "</lastName>";
+			userOutput+="<displayName>" + firstName + " " + lastName + "</displayName>";
+			userOutput+="</user>";
+		}
+		userOutput += "</users></xml>";
+		return userOutput;
+	}
+
+	/**
+	 * @param sortedGroups
+	 * @return String of groups
+	 */ 
+	private String buildGroupsString(Set<Group> sortedGroups) {
+		String groupOutput = "";
+
+		boolean first = true;
+		for ( Group group: sortedGroups ) {
+			Long groupId = group.getGroupId();
+			String name = group.getGroupName();
+			Integer numberOfMembers = group.getUsers().size();
+			if ( ! first ) {
+				groupOutput=groupOutput+";";
+			} else {
+				first = false;
+			}
+			groupOutput=groupOutput+groupId+","+name+","+numberOfMembers;
+		}
+		
+		return groupOutput;
+	}
+	
+	/**
+	 * @param sortedGroups
+	 * @return String of groups
+	 */ 
+	private String buildGroupsStringXML(Set<Group> sortedGroups) {
+		String groupOutput = "<xml><groups>";
+		for ( Group group: sortedGroups ) {
+			Long groupId = group.getGroupId();
+			String name = group.getGroupName();
+			Integer numberOfMembers = group.getUsers().size();
+			
+			groupOutput+="<group>";
+			groupOutput+="<id>" + groupId + "</id>";
+			groupOutput+="<name>" + name + "</name>";
+			groupOutput+="<numberOfMembers>" + numberOfMembers + "</numberOfMembers>";
+			groupOutput+="</group>";
+		}
+		groupOutput += "</groups></xml>";
+		
+		return groupOutput;
+	}
+
+	/**
+	 * @param group
+	 * @return String of xml with group added
+	 */ 
+	private String buildAddGroupStringXML(Group group) {
+		String groupOutput = "<xml><group>";
+		groupOutput += "<id>" + group.getGroupId() + "</id>";
+		groupOutput += "<name>" + group.getGroupName() + "</name>";
+		groupOutput += "</group></xml>";
+		return groupOutput;
+	}	
+	
+	/**
+	 * @param group
+	 * @return String of xml with group added
+	 */ 
+	private String buildRemoveGroupStringXML(Long groupID) {
+		String groupOutput = "<xml><group>";
+		groupOutput += "<id>" + groupID + "</id>";
+		groupOutput += "</group></xml>";
+		return groupOutput;
+	}
+	
+	/**
+	 * @param group
+	 * @return String of xml with group added
+	 */ 
+	private String buildChangeGroupNameStringXML(Long groupID, String name) {
+		String groupOutput = "<xml><group>";
+		groupOutput += "<id>" + groupID + "</id>";
+		groupOutput += "<newName>" + name + "</newName>";
+		groupOutput += "</group></xml>";
+		return groupOutput;
+	}	
+	
+	/**
+	 * @return String of xml with all needed language elements
+	 */ 
+	private String getLanguageXML(){
+		IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
+		MessageService messageService = monitoringService.getMessageService();
+		ArrayList<String> languageCollection = new ArrayList<String>();		
+		languageCollection.add(new String("button.finished"));
+		languageCollection.add(new String("label.grouping.non.grouped.users.heading"));
+		languageCollection.add(new String("label.grouping.status"));
+		languageCollection.add(new String("label.grouping.functions"));
+		languageCollection.add(new String("label.grouping.popup.change.group.name"));
+		languageCollection.add(new String("label.grouping.popup.change.group.name.field"));
+		languageCollection.add(new String("label.grouping.learners"));
+		languageCollection.add(new String("label.grouping.popup.delete.group"));
+		languageCollection.add(new String("label.grouping.popup.delete.group.message"));
+		languageCollection.add(new String("button.ok"));
+		languageCollection.add(new String("button.cancel"));
+		languageCollection.add(new String("button.yes"));
+		languageCollection.add(new String("button.no"));
+		languageCollection.add(new String("error.title"));
+		languageCollection.add(new String("label.grouping.max.num.in.group.heading"));
+		
+		String languageOutput = "<xml><language>";
+		
+		for(int i = 0; i < languageCollection.size(); i++){
+			languageOutput += "<entry key='" + languageCollection.get(i) + "'><name>" + messageService.getMessage(languageCollection.get(i)) + "</name></entry>";
+		}
+		
+		languageOutput += "</language></xml>";
+		
+		return languageOutput;
+	}
+	
 	/** 
 	 * Add a new group. Designed to respond to an AJAX call.
      * If the teacher wants to add more groups than the number of groups set in authoring, and this grouping
@@ -305,8 +436,9 @@
     	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
     	String name = WebUtil.readStrParam(request, PARAM_NAME);
 		IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
-		monitoringService.addGroup(activityID, name, true);
-		writeAJAXResponse(response,"");
+		Group group = monitoringService.addGroup(activityID, name, true);
+		String groupResponse = buildAddGroupStringXML(group);
+		writeAJAXResponse(response,groupResponse);
 		return null;
 	}
 
@@ -326,7 +458,8 @@
 
     	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
 		monitoringService.removeGroup(activityID, groupID);
-		writeAJAXOKResponse(response);
+		String responseString = buildRemoveGroupStringXML(groupID);
+		writeAJAXResponse(response, responseString);
 		return null;
 	}
 
@@ -345,14 +478,36 @@
     	Long groupID = WebUtil.readLongParam(request, AttributeNames.PARAM_GROUP_ID);
     	String members = WebUtil.readStrParam(request, PARAM_MEMBERS, true);
     	if ( members != null ) {
-        	String[] membersSplit = members.split(","); 
+        	String[] membersSplit = members.split(",");
 			IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
 			monitoringService.addUsersToGroup(activityID,  groupID, membersSplit);
     	}
 		writeAJAXOKResponse(response);
 		return null;
 	}
+	
+	/** 
+	 * Add learners to a group. Designed to respond to an AJAX call.
+     *
+	 * Input parameters: activityID, name: group name, members: comma separated list of users 
+	 * 
+	 * Output format: no data returned - just the header 
+	 */
+	public ActionForward changeGroupName(ActionMapping mapping,
+			ActionForm form, HttpServletRequest request,
+			HttpServletResponse response) throws IOException, ServletException, LessonServiceException {
 
+    	Long groupID = WebUtil.readLongParam(request, AttributeNames.PARAM_GROUP_ID);
+    	String name = WebUtil.readStrParam(request, PARAM_NAME, true);
+    	if ( name != null ) {
+			IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
+			monitoringService.setGroupName(groupID, name);
+    	}
+    	String reponseSting = buildChangeGroupNameStringXML(groupID, name);
+		writeAJAXResponse(response, reponseSting);
+		return null;
+	}
+
 	/** 
 	 * Remove a list of users from a group. Designed to respond to an AJAX call.
      *
@@ -375,5 +530,4 @@
 		writeAJAXOKResponse(response);
 		return null;
 	}
-
 }
Index: lams_monitoring/web/branching/BranchManager.swf
===================================================================
diff -u
Binary files differ
Index: lams_monitoring/web/branching/chosenSelection.jsp
===================================================================
diff -u -r5822fa33a4644a07c816fa58c4a0e083e908c4a9 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/web/branching/chosenSelection.jsp	(.../chosenSelection.jsp)	(revision 5822fa33a4644a07c816fa58c4a0e083e908c4a9)
+++ lams_monitoring/web/branching/chosenSelection.jsp	(.../chosenSelection.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -34,290 +34,21 @@
       <title><c:out value="${title}"/></title>
 
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/error.js"></script>
-
+	<script src="<lams:LAMSURL/>includes/javascript/AC_OETags.js" type="text/javascript"></script>
+	
 	<script type="text/javascript">
-	<!-- 
-		function init(){
-			getBranchesAndNonmembers();
-		}
+		var requiredMajorVersion = 9;
+		var requiredMinorVersion = 0;
+		var requiredRevision = 124;
 
-		function adjustButtonStatus(){
-			if(document.getElementById("branches").selectedIndex==-1){
-				document.getElementById("nonmembersadd").disabled=true;
-				document.getElementById("membersremove").disabled=true;
-			}else{
-				if(document.getElementById("nonmembers[]").selectedIndex==-1){
-					document.getElementById("nonmembersadd").disabled=true;
-				}else{
-					document.getElementById("nonmembersadd").disabled=false;
-				}
-				if(document.getElementById("members[]").selectedIndex==-1 || ! <c:out value="${mayDelete}"/> ){
-					document.getElementById("membersremove").disabled=true;
-				}else{
-					document.getElementById("membersremove").disabled=false;
-				}
-			}
+		function closeWindow(){
+			window.close();
 		}
-
-		function getBranchesAndNonmembers(){
-			getBranches();
-			getNonmembers();
-			document.getElementById("members[]").options.length = 0;
-			adjustButtonStatus();
-		}
-
-		function getBranches(){
-			displayLoadingMessage();
-			url="<lams:LAMSURL/>monitoring/chosenBranching.do?method=getBranches&activityID=<c:out value="${activityID}"/>";
-			if (window.XMLHttpRequest) { // Non-IE browsers
-				branchRequest = new XMLHttpRequest();
-				branchRequest.onreadystatechange = updateBranches;
-				try {
-						branchRequest.open("GET", url, true);
-				} catch (e) {
-						alert(e);
-				}
-				branchRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-				branchRequest = new ActiveXObject("Microsoft.XMLHTTP");
-				if (branchRequest) {
-						branchRequest.onreadystatechange = updateBranches;
-						branchRequest.open("GET", url, true);
-						branchRequest.send();
-				}
-			}
-		}
-
-		function updateBranches(){
-			if (branchRequest.readyState == 4) { // Complete
-				clearMessage();
-				if (branchRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", branchRequest.responseText);
-					var branchSelectObj = document.getElementById("branches");
-					branchSelectObj.options.length = 0;
-					var res = branchRequest.responseText.replace(/^\s*|\s*$/g,"");
-					if(res.length>0){
-						var branches = res.split(";");
-						for (i=0; i<branches.length; i++){
-							var branch = branches[i].split(",");
-							branchSelectObj.options[branchSelectObj.length] = new Option(branch[1]+" ("+branch[2]+")",branch[0]);
-						}
-					}
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+branchRequest.status+".");
-				}
-				adjustButtonStatus();
-			}
-		}
-
-		function getNonmembers(){
-			displayLoadingMessage();
-			url="<lams:LAMSURL/>monitoring/chosenBranching.do?method=getClassMembersNotGrouped&lessonID=<c:out value="${lessonID}"/>&activityID=<c:out value="${activityID}"/>";
-			if (window.XMLHttpRequest) { // Non-IE browsers
-				nonmembersRequest = new XMLHttpRequest();
-				nonmembersRequest.onreadystatechange = updateNonmembers;
-				try {
-					nonmembersRequest.open("GET", url, true);
-				} catch (e) {
-					alert(e);
-				}
-				nonmembersRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-				nonmembersRequest = new ActiveXObject("Microsoft.XMLHTTP");
-				if (nonmembersRequest) {
-					nonmembersRequest.onreadystatechange = updateNonmembers;
-					nonmembersRequest.open("GET", url, true);
-					nonmembersRequest.send();
-				}
-			}
-		}
-
-		function updateNonmembers(){
-			if (nonmembersRequest.readyState == 4) { // Complete
-				clearMessage();
-				if (nonmembersRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", nonmembersRequest.responseText);
-					var nonmembersSelectObj = document.getElementById("nonmembers[]");
-					nonmembersSelectObj.options.length = 0;
-					var res = nonmembersRequest.responseText.replace(/^\s*|\s*$/g,"");
-					if(res.length>0){
-						var nonmembers = res.split(";");
-						for (i=0; i<nonmembers.length; i++){
-							var nonmember = nonmembers[i].split(",");
-							nonmembersSelectObj.options[nonmembersSelectObj.length] = new Option(nonmember[2]+" "+nonmember[1],nonmember[0]);
-						}
-					}
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+branchRequest.status+".");
-				}
-				adjustButtonStatus();
-			}
-		}
-
-		function getMembers(branch){
-			displayLoadingMessage();
-			url="<lams:LAMSURL/>monitoring/chosenBranching.do?method=getBranchMembers&branchID="+branch.value;
-			if (window.XMLHttpRequest) { // Non-IE browsers
-				memberRequest = new XMLHttpRequest();
-				memberRequest.onreadystatechange = updateMembers;
-				try {
-					memberRequest.open("GET", url, true);
-				} catch (e) {
-					alert(e);
-				}
-				memberRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-				memberRequest = new ActiveXObject("Microsoft.XMLHTTP");
-				if (memberRequest) {
-					memberRequest.onreadystatechange = updateMembers;
-					memberRequest.open("GET", url, true);
-					memberRequest.send();
-				}
-			}
-		}
-
-		function updateMembers(){
-			if (memberRequest.readyState == 4) { // Complete
-				clearMessage();
-				if (memberRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", memberRequest.responseText);
-					var membersSelectObj = document.getElementById("members[]");
-					membersSelectObj.options.length = 0;
-					var res = memberRequest.responseText.replace(/^\s*|\s*$/g,"");
-					if(res.length>0){
-						var members = res.split(";");
-						for (i=0; i<members.length; i++){
-							var member = members[i].split(",");
-							membersSelectObj.options[membersSelectObj.length] = new Option(member[2]+" "+member[1],member[0]);
-						}
-					}
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+memberRequest.status);
-				}
-				adjustButtonStatus();
-			}
-		}
-
-		
-		var count = 0;
-
-		function addMembersToBranch(){
-			var nonmembersSelectObj = document.getElementById("nonmembers[]");
-			var members = "";
-			for(i=0; i<nonmembersSelectObj.length; i++){
-				if(nonmembersSelectObj.options[i].selected){
-					count++;
-					members = members + "," + nonmembersSelectObj.options[i].value;
-				}	
-			}
-			url="<lams:LAMSURL/>monitoring/chosenBranching.do?method=addMembers&branchID="+document.getElementById("branches").value+"&members="+members.substr(1);
-			if (window.XMLHttpRequest) { // Non-IE browsers
-					addmbrsRequest = new XMLHttpRequest();
-					addmbrsRequest.onreadystatechange = membersAdded;
-					try {
-							addmbrsRequest.open("GET", url, true);
-					} catch (e) {
-							alert(e);
-					}
-					addmbrsRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-					addmbrsRequest = new ActiveXObject("Microsoft.XMLHTTP");
-					if (addmbrsRequest) {
-							addmbrsRequest.onreadystatechange = membersAdded;
-							addmbrsRequest.open("GET", url, true);
-							addmbrsRequest.send();
-					}
-			}
-		}
-
-		function membersAdded(){
-				if (addmbrsRequest.readyState == 4) { // Complete
-						if (addmbrsRequest.status == 200) { // OK response
-							checkForErrorScreen("<fmt:message key="error.grouping.data"/>", addmbrsRequest.responseText);
-							getNonmembers(document.getElementById("branches"));
-							getMembers(document.getElementById("branches"));
-							var branchSelectObj = document.getElementById("branches");
-							var branchName = branchSelectObj.options[branchSelectObj.selectedIndex].text;
-							var index1 = branchName.lastIndexOf("(");
-							var index2 = branchName.lastIndexOf(")");
-							var num = branchName.substring(index1+1,index2);
-							num = parseInt(num) + count;
-							branchSelectObj.options[branchSelectObj.selectedIndex].text = branchName.substring(0,index1)+"("+num+")";
-							count = 0;
-						}else{
-							alert("<fmt:message key="error.grouping.data"/>"+" "+addmbrsRequest.status);
-						}
-					adjustButtonStatus();
-				}
-		}
-
-		
-		function removeMembersFromBranch(){
-			var membersSelectObj = document.getElementById("members[]");
-			var nonmembers = "";
-			for(i=0; i<membersSelectObj.length; i++){
-				if(membersSelectObj.options[i].selected){
-					count++;
-					nonmembers = nonmembers + "," + membersSelectObj.options[i].value;
-				}	
-			}
-			url="<lams:LAMSURL/>monitoring/chosenBranching.do?method=removeMembers&branchID="+document.getElementById("branches").value+"&members="+nonmembers.substr(1);
-			if (window.XMLHttpRequest) { // Non-IE browsers
-					rmmbrsRequest = new XMLHttpRequest();
-					rmmbrsRequest.onreadystatechange = membersRemoved;
-					try {
-							rmmbrsRequest.open("GET", url, true);
-					} catch (e) {
-							alert(e);
-					}
-					rmmbrsRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-					rmmbrsRequest = new ActiveXObject("Microsoft.XMLHTTP");
-					if (rmmbrsRequest) {
-							rmmbrsRequest.onreadystatechange = membersRemoved;
-							rmmbrsRequest.open("GET", url, true);
-							rmmbrsRequest.send();
-					}
-			}
-		}
-
-		function membersRemoved(){
-			if (rmmbrsRequest.readyState == 4) { // Complete
-					if (rmmbrsRequest.status == 200) { // OK response
-						checkForErrorScreen("<fmt:message key="error.grouping.data"/>", rmmbrsRequest.responseText);
-						getMembers(document.getElementById("branches"));
-						getNonmembers(document.getElementById("branches"));
-						var branchSelectObj = document.getElementById("branches");
-						var branchName = branchSelectObj.options[branchSelectObj.selectedIndex].text;
-						var index1 = branchName.lastIndexOf("(");
-						var index2 = branchName.lastIndexOf(")");
-						var num = branchName.substring(index1+1,index2);
-						num = parseInt(num) - count;
-						branchSelectObj.options[branchSelectObj.selectedIndex].text = branchName.substring(0,index1)+"("+num+")";
-						count = 0;
-					}else{
-						alert("<fmt:message key="error.grouping.data"/>"+" "+rmmbrsRequest.status);
-					}
-			adjustButtonStatus();
-			}
-		}	
-
-		function displayLoadingMessage() {
-			document.getElementById("message").innerHTML = "<fmt:message key="label.grouping.loading"/>";
-		}
-
-		function clearMessage() {
-			document.getElementById("message").innerHTML = "";
-		}
-		
-	//-->
 	</script>
-
-	  <NOSCRIPT><!--This browser doesn't supports scripting--></NOSCRIPT>
 	
 </lams:head>
 
-<body class="stripes" onLoad="init()">
+<body class="stripes">
 
 	<div id="content">
 
@@ -334,43 +65,84 @@
 	<p>&nbsp;<span id="message" align="right"></span></p>
 
 	<P><STRONG><fmt:message key="label.grouping.general.instructions.heading"/></STRONG> <fmt:message key="label.branching.general.instructions"/></P>
-
-	<table class="chosenbranching">
-		<tr>
-			<th><fmt:message key="label.branching.branch.heading"/></th>
-			<th><fmt:message key="label.branching.non.allocated.users.heading"/></th>
-			<th><fmt:message key="label.branching.allocated.users.heading"/></th>
-   		 </tr>
-		<tr>
-			<td width="34%">
-				<select id="branches" name="branches" size="15" onChange="getMembers(this)">
-				</select>
-			</td >
-			<td width="33%">
-				<select  id="nonmembers[]" name="nonmembers[]" size="15" multiple="multiple" onChange="adjustButtonStatus()">
-				</select>
-			</td>
-			<td width="33%">
-				<select  id="members[]" name="members[]" size="15" multiple="multiple" onChange="adjustButtonStatus()">
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="34%">
-				&nbsp;
-			</td >
-			<td width="33%">
-				<input type="button" class="button"  id="nonmembersadd" name="nonmembersadd" value="<fmt:message key="button.branching.add.user.to.branch"/>" onclick="addMembersToBranch()" disabled="true"/>
-			</td>
-			<td width="33%">
-				   <input type="button" class="button" id="membersremove" name="membersremove" value="<fmt:message key="button.branching.remove.user.from.branch"/>" onclick="removeMembersFromBranch()" disabled="true"/>
-			</td>
-		</tr>
-	</table>
-	<%@ include file="../template/finishbutton.jsp" %>
-	</form>
-
+	
+	<div align="center">
+		<script language="JavaScript" type="text/javascript">
+		<!--
+		// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+		var hasProductInstall = DetectFlashVer(6, 0, 65);
+		
+		// Version check based upon the values defined in globals
+		var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+		
+		if ( hasProductInstall && !hasRequestedVersion ) {
+			// DO NOT MODIFY THE FOLLOWING FOUR LINES
+			// Location visited after installation is complete if installation is required
+			var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+			var MMredirectURL = window.location;
+		    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+		    var MMdoctitle = document.title;
+		
+			AC_FL_RunContent(
+				"src", "playerProductInstall",
+				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+				"width", "793",
+				"height", "454",
+				"align", "middle",
+				"id", "BranchManager",
+				"quality", "high",
+				"bgcolor", "#ffffff",
+				"name", "BranchManager",
+				"allowScriptAccess","sameDomain",
+				"type", "application/x-shockwave-flash",
+				"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		} else if (hasRequestedVersion) {
+			// if we've detected an acceptable version
+			// embed the Flash Content SWF when all tests are passed
+			AC_FL_RunContent(
+					"src", "BranchManager",
+					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+					"width", "793",
+					"height", "454",
+					"align", "middle",
+					"id", "BranchManager",
+					"quality", "high",
+					"bgcolor", "#ffffff",
+					"name", "BranchManager",
+					"allowScriptAccess","sameDomain",
+					"type", "application/x-shockwave-flash",
+					"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		  } else {  // flash is too old or we can't detect the plugin
+		    var alternateContent = 'Alternate HTML content should be placed here. '
+		  	+ 'This content requires the Adobe Flash Player. '
+		   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+		    document.write(alternateContent);  // insert non-flash content
+		  }
+		// -->
+		</script>
+		<noscript>
+		  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+					id="BranchManager" width="793" height="454"
+					codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+					<param name="movie" value="BranchManager.swf" />
+					<param name="quality" value="high" />
+					<param name="bgcolor" value="#869ca7" />
+					<param name="allowScriptAccess" value="sameDomain" />
+					<embed src="BranchManager.swf" quality="high" bgcolor="#869ca7"
+						width="793" height="454" name="BranchManager" align="middle"
+						play="true"
+						loop="false"
+						quality="high"
+						allowScriptAccess="sameDomain"
+						type="application/x-shockwave-flash"
+						pluginspage="http://www.adobe.com/go/getflashplayer">
+					</embed>
+			</object>
+		</noscript>
 	</div>
+	</div>
 
 	<div id="footer">
 	</div><!--closes footer-->
Index: lams_monitoring/web/branching/viewBranches.jsp
===================================================================
diff -u -r3a4c502dd96ac40fd96827f36bc450158b145113 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/web/branching/viewBranches.jsp	(.../viewBranches.jsp)	(revision 3a4c502dd96ac40fd96827f36bc450158b145113)
+++ lams_monitoring/web/branching/viewBranches.jsp	(.../viewBranches.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -26,7 +26,18 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+<script src="<lams:LAMSURL/>includes/javascript/AC_OETags.js" type="text/javascript"></script>
 
+<script type="text/javascript">
+	var requiredMajorVersion = 9;
+	var requiredMinorVersion = 0;
+	var requiredRevision = 124;
+
+	function closeWindow(){
+		window.close();
+	}
+</script>
+
 <div id="content">
 
 	<h1><c:out value="${title}"/></h1>
@@ -36,34 +47,82 @@
 		<p><c:out value="${description}"/></p>
 	</c:if>
 
-	<table class="alternative-color" cellspacing="0">
-		<tr>
-			<th><fmt:message key="label.branching.branch.heading"/></th>
-			<th>&nbsp;</th>
-		</tr>
-			
-		<c:forEach items="${branching.branches}" var="branch">
-		<tr>
-			<td width="25%" class="first">
-				<c:out value="${branch.branchName}"/>
-			</td>
-			<td>
-				<c:forEach items="${branch.groups}" var="group" varStatus="status">
- 					<c:if test="${showGroupName}">
-						<strong><c:out value="${group.groupName}"/></strong><BR>
-					</c:if>
-					<c:forEach items="${group.users}" var="user">
-						<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/><BR>
-					</c:forEach>
-				</c:forEach>
-			</td>
-		</tr>
-		</c:forEach>
-	</table>
+	<div align="center">
+		<script language="JavaScript" type="text/javascript">
+		<!--
+		// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+		var hasProductInstall = DetectFlashVer(6, 0, 65);
 		
-	<c:if test="${not localFiles}">
-		<%@ include file="../template/finishbutton.jsp" %>
-	</c:if>
+		// Version check based upon the values defined in globals
+		var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+		
+		if ( hasProductInstall && !hasRequestedVersion ) {
+			// DO NOT MODIFY THE FOLLOWING FOUR LINES
+			// Location visited after installation is complete if installation is required
+			var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+			var MMredirectURL = window.location;
+		    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+		    var MMdoctitle = document.title;
+		
+			AC_FL_RunContent(
+				"src", "playerProductInstall",
+				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+				"width", "793",
+				"height", "454",
+				"align", "middle",
+				"id", "BranchManager",
+				"quality", "high",
+				"bgcolor", "#ffffff",
+				"name", "BranchManager",
+				"allowScriptAccess","sameDomain",
+				"type", "application/x-shockwave-flash",
+				"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		} else if (hasRequestedVersion) {
+			// if we've detected an acceptable version
+			// embed the Flash Content SWF when all tests are passed
+			AC_FL_RunContent(
+					"src", "BranchManager",
+					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+					"width", "793",
+					"height", "454",
+					"align", "middle",
+					"id", "BranchManager",
+					"quality", "high",
+					"bgcolor", "#ffffff",
+					"name", "BranchManager",
+					"allowScriptAccess","sameDomain",
+					"type", "application/x-shockwave-flash",
+					"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		  } else {  // flash is too old or we can't detect the plugin
+		    var alternateContent = 'Alternate HTML content should be placed here. '
+		  	+ 'This content requires the Adobe Flash Player. '
+		   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+		    document.write(alternateContent);  // insert non-flash content
+		  }
+		// -->
+		</script>
+		<noscript>
+		  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+					id="BranchManager" width="793" height="454"
+					codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+					<param name="movie" value="BranchManager.swf" />
+					<param name="quality" value="high" />
+					<param name="bgcolor" value="#869ca7" />
+					<param name="allowScriptAccess" value="sameDomain" />
+					<embed src="BranchManager.swf" quality="high" bgcolor="#869ca7"
+						width="793" height="454" name="BranchManager" align="middle"
+						play="true"
+						loop="false"
+						quality="high"
+						allowScriptAccess="sameDomain"
+						type="application/x-shockwave-flash"
+						pluginspage="http://www.adobe.com/go/getflashplayer">
+					</embed>
+			</object>
+		</noscript>
+	</div>
 </div>  <!--closes content-->
 
 
Index: lams_monitoring/web/grouping/GroupManager.swf
===================================================================
diff -u
Binary files differ
Index: lams_monitoring/web/grouping/chosenGrouping.jsp
===================================================================
diff -u -r5822fa33a4644a07c816fa58c4a0e083e908c4a9 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision 5822fa33a4644a07c816fa58c4a0e083e908c4a9)
+++ lams_monitoring/web/grouping/chosenGrouping.jsp	(.../chosenGrouping.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -34,422 +34,21 @@
       <title><c:out value="${title}"/></title>
 
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>includes/javascript/error.js"></script>
-
+	<script src="<lams:LAMSURL/>includes/javascript/AC_OETags.js" type="text/javascript"></script>
+	
 	<script type="text/javascript">
-	<!-- 
-		<c:choose>
-		<c:when test="${empty maxNumberOfGroups}">
-			var maxNumberOfGroups = 0;
-		</c:when>
-		<c:otherwise>
-			var maxNumberOfGroups = ${maxNumberOfGroups};
-		</c:otherwise>
-		</c:choose>
-		
-		<c:choose>
-		<c:when test="${empty mayDelete}">
-			var mayDelete = false;
-		</c:when>
-		<c:otherwise>
-			var mayDelete = ${mayDelete};
-		</c:otherwise>
-		</c:choose>
+		var requiredMajorVersion = 9;
+		var requiredMinorVersion = 0;
+		var requiredRevision = 124;
 
-		<c:choose>
-		<c:when test="${empty usedForBranching}">
-			var usedForBranching = true;
-		</c:when>
-		<c:otherwise>
-			var usedForBranching = ${usedForBranching};
-		</c:otherwise>
-		</c:choose>
-
-		function init(){
-			getGroupsAndNonmembers();
+		function closeWindow(){
+			window.close();
 		}
-
-		function ajustButtonStatus(){
-			if (usedForBranching) {
-				document.getElementById("groupremove").style.visibility = "hidden";
-				document.getElementById("groupadd").style.visibility = "hidden";
-				document.getElementById("newgroupname").style.visibility = "hidden";
-			} 
-									
-			if(document.getElementById("groups").selectedIndex==-1){
-				document.getElementById("groupremove").disabled=true;
-				document.getElementById("nonmembersadd").disabled=true;
-				document.getElementById("membersremove").disabled=true;
-			}else{
-				if ( mayDelete ) {
-					document.getElementById("groupremove").disabled=false;
-				}
-				if(document.getElementById("nonmembers[]").selectedIndex==-1){
-					document.getElementById("nonmembersadd").disabled=true;
-				}else{
-					document.getElementById("nonmembersadd").disabled=false;
-				}
-				if(document.getElementById("members[]").selectedIndex==-1 || ! mayDelete ){
-					document.getElementById("membersremove").disabled=true;
-				}else{
-					document.getElementById("membersremove").disabled=false;
-				}
-			}
-		}
-
-		function getGroupsAndNonmembers(){
-			getGroups();
-			getNonmembers();
-			document.getElementById("members[]").options.length = 0;
-			ajustButtonStatus();
-		}
-
-		function getGroups(){
-			displayLoadingMessage();
-			url="<lams:LAMSURL/>monitoring/grouping.do?method=getGroups&activityID=<c:out value="${activityID}"/>";
-			if (window.XMLHttpRequest) { // Non-IE browsers
-				groupRequest = new XMLHttpRequest();
-				groupRequest.onreadystatechange = updateGroups;
-				try {
-						groupRequest.open("GET", url, true);
-				} catch (e) {
-						alert(e);
-				}
-				groupRequest.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
-				groupRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-				groupRequest = new ActiveXObject("Microsoft.XMLHTTP");
-				if (groupRequest) {
-						groupRequest.onreadystatechange = updateGroups;
-						groupRequest.open("GET", url, true);
-						groupRequest.send();
-				}
-			}
-		}
-
-		function updateGroups(){
-			if (groupRequest.readyState == 4) { // Complete
-				clearMessage();
-				if (groupRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", groupRequest.responseText);
-					var grpSelectObj = document.getElementById("groups");
-					grpSelectObj.options.length = 0;
-					var res = groupRequest.responseText.replace(/^\s*|\s*$/g,"");
-					if(res.length>0){
-						var groups = res.split(";");
-						for (i=0; i<groups.length; i++){
-							var group = groups[i].split(",");
-							grpSelectObj.options[grpSelectObj.length] = new Option(group[1]+" ("+group[2]+")",group[0]);
-						}
-					}
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+groupRequest.status+".");
-				}
-				ajustButtonStatus();
-			}
-		}
-
-		function getNonmembers(){
-			displayLoadingMessage();
-			url="<lams:LAMSURL/>monitoring/grouping.do?method=getClassMembersNotGrouped&lessonID=<c:out value="${lessonID}"/>&activityID=<c:out value="${activityID}"/>";
-			if (window.XMLHttpRequest) { // Non-IE browsers
-				nonmembersRequest = new XMLHttpRequest();
-				nonmembersRequest.onreadystatechange = updateNonmembers;
-				try {
-					nonmembersRequest.open("GET", url, true);
-				} catch (e) {
-					alert(e);
-				}
-				nonmembersRequest.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
-				nonmembersRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-				nonmembersRequest = new ActiveXObject("Microsoft.XMLHTTP");
-				if (nonmembersRequest) {
-					nonmembersRequest.onreadystatechange = updateNonmembers;
-					nonmembersRequest.open("GET", url, true);
-					nonmembersRequest.send();
-				}
-			}
-		}
-
-		function updateNonmembers(){
-			if (nonmembersRequest.readyState == 4) { // Complete
-				clearMessage();
-				if (nonmembersRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", nonmembersRequest.responseText);
-					var nonmembersSelectObj = document.getElementById("nonmembers[]");
-					nonmembersSelectObj.options.length = 0;
-					var res = nonmembersRequest.responseText.replace(/^\s*|\s*$/g,"");
-					if(res.length>0){
-						var nonmembers = res.split(";");
-						for (i=0; i<nonmembers.length; i++){
-							var nonmember = nonmembers[i].split(",");
-							nonmembersSelectObj.options[nonmembersSelectObj.length] = new Option(nonmember[2]+" "+nonmember[1],nonmember[0]);
-						}
-					}
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+nonmembersRequest.status+".");
-				}
-				ajustButtonStatus();
-			}
-		}
-
-		function getMembers(group){
-			displayLoadingMessage();
-			url="<lams:LAMSURL/>monitoring/grouping.do?method=getGroupMembers&activityID=<c:out value="${activityID}"/>&groupID="+group.value;
-			if (window.XMLHttpRequest) { // Non-IE browsers
-				memberRequest = new XMLHttpRequest();
-				memberRequest.onreadystatechange = updateMembers;
-				try {
-					memberRequest.open("GET", url, true);
-				} catch (e) {
-					alert(e);
-				}
-				memberRequest.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
-				memberRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-				memberRequest = new ActiveXObject("Microsoft.XMLHTTP");
-				if (memberRequest) {
-					memberRequest.onreadystatechange = updateMembers;
-					memberRequest.open("GET", url, true);
-					memberRequest.send();
-				}
-			}
-		}
-
-		function updateMembers(){
-			if (memberRequest.readyState == 4) { // Complete
-				clearMessage();
-				if (memberRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", memberRequest.responseText);
-					var membersSelectObj = document.getElementById("members[]");
-					membersSelectObj.options.length = 0;
-					var res = memberRequest.responseText.replace(/^\s*|\s*$/g,"");
-					if(res.length>0){
-						var members = res.split(";");
-						for (i=0; i<members.length; i++){
-							var member = members[i].split(",");
-							membersSelectObj.options[membersSelectObj.length] = new Option(member[2]+" "+member[1],member[0]);
-						}
-					}
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+memberRequest.status);
-				}
-				ajustButtonStatus();
-			}
-		}
-
-		
-		function addGroup(){
-			if(document.getElementById("newgroupname").value.replace(/^\s*|\s*$/g,"").length==0){
-				alert("<fmt:message key="error.grouping.add.group"/>");
-				document.getElementById("newgroupname").focus();
-			}else{
-				
-				url="<lams:LAMSURL/>monitoring/grouping.do";
-				var params = "method=addGroup&activityID=<c:out value="${activityID}"/>&name="+document.getElementById("newgroupname").value;
-				
-				if (window.XMLHttpRequest) { // Non-IE browsers
-						addgrpRequest = new XMLHttpRequest();
-						addgrpRequest.onreadystatechange = grpAdded;
-						try {
-								addgrpRequest.open("POST", url, true);
-						} catch (e) {
-								alert(e);
-						}
-						addgrpRequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-						addgrpRequest.setRequestHeader("Content-length", params.length);
-						addgrpRequest.setRequestHeader("Connection", "close");
-						addgrpRequest.send(params);
-				} else if (window.ActiveXObject) { // IE
-						addgrpRequest = new ActiveXObject("Microsoft.XMLHTTP");
-						if (addgrpRequest) {
-								addgrpRequest.onreadystatechange = grpAdded;
-								addgrpRequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-								addgrpRequest.setRequestHeader("Content-length", params.length);
-								addgrpRequest.setRequestHeader("Connection", "close");
-								addgrpRequest.open("POST", url, true);
-								addgrpRequest.send(params);
-						}
-				}
-			}
-		}
-
-		function grpAdded(){
-			if (addgrpRequest.readyState == 4) { // Complete
-				if (addgrpRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", addgrpRequest.responseText);
-					getGroups();
-					document.getElementById("newgroupname").value = "";
-					document.getElementById("members[]").options.length=0;
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+addgrpRequest.status);
-				}
-				ajustButtonStatus();
-			}
-		}
-
-		function removeGroup(){
-			if(document.getElementById("groups").selectedIndex == -1){
-				alert("<fmt:message key="${error.grouping.remove.group}"/>");
-			}else{
-				url="<lams:LAMSURL/>monitoring/grouping.do?method=removeGroup&activityID=<c:out value="${activityID}"/>&groupID="+document.getElementById("groups").value;
-				if (window.XMLHttpRequest) { // Non-IE browsers
-						rmgrpRequest = new XMLHttpRequest();
-						rmgrpRequest.onreadystatechange = grpRemoved;
-						try {
-								rmgrpRequest.open("GET", url, true);
-						} catch (e) {
-								alert(e);
-						}
-						rmgrpRequest.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
-						rmgrpRequest.send(null);
-				} else if (window.ActiveXObject) { // IE
-						rmgrpRequest = new ActiveXObject("Microsoft.XMLHTTP");
-						if (rmgrpRequest) {
-								rmgrpRequest.onreadystatechange = grpRemoved;
-								rmgrpRequest.open("GET", url, true);
-								rmgrpRequest.send();
-						}
-				}
-			}
-		}
-
-		function grpRemoved(){
-			if (rmgrpRequest.readyState == 4) { // Complete
-				if (rmgrpRequest.status == 200) { // OK response
-					checkForErrorScreen("<fmt:message key="error.grouping.data"/>", rmgrpRequest.responseText);
-					var grpSelectObj = document.getElementById("groups");
-					grpSelectObj.remove(grpSelectObj.selectedIndex);
-					document.getElementById("members[]").options.length = 0;
-					getNonmembers(document.getElementById("groupings"));
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+rmgrpRequest.status);
-				}
-				ajustButtonStatus();
-			}
-		}
-
-		var count = 0;
-
-		function addMembersToGroup(){
-			var nonmembersSelectObj = document.getElementById("nonmembers[]");
-			var members = "";
-			for(i=0; i<nonmembersSelectObj.length; i++){
-				if(nonmembersSelectObj.options[i].selected){
-					count++;
-					members = members + "," + nonmembersSelectObj.options[i].value;
-				}	
-			}
-			url="<lams:LAMSURL/>monitoring/grouping.do?method=addMembers&activityID=<c:out value="${activityID}"/>&groupID="+document.getElementById("groups").value+"&members="+members.substr(1);
-			if (window.XMLHttpRequest) { // Non-IE browsers
-					addmbrsRequest = new XMLHttpRequest();
-					addmbrsRequest.onreadystatechange = membersAdded;
-					try {
-							addmbrsRequest.open("GET", url, true);
-					} catch (e) {
-							alert(e);
-					}
-					addmbrsRequest.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
-					addmbrsRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-					addmbrsRequest = new ActiveXObject("Microsoft.XMLHTTP");
-					if (addmbrsRequest) {
-							addmbrsRequest.onreadystatechange = membersAdded;
-							addmbrsRequest.open("GET", url, true);
-							addmbrsRequest.send();
-					}
-			}
-		}
-
-		function membersAdded(){
-				if (addmbrsRequest.readyState == 4) { // Complete
-						if (addmbrsRequest.status == 200) { // OK response
-							checkForErrorScreen("<fmt:message key="error.grouping.data"/>", addmbrsRequest.responseText);
-							getNonmembers(document.getElementById("groupings"));
-							getMembers(document.getElementById("groups"));
-							var groupSelectObj = document.getElementById("groups");
-							var groupName = groupSelectObj.options[groupSelectObj.selectedIndex].text;
-							var index1 = groupName.lastIndexOf("(");
-							var index2 = groupName.lastIndexOf(")");
-							var num = groupName.substring(index1+1,index2);
-							num = parseInt(num) + count;
-							groupSelectObj.options[groupSelectObj.selectedIndex].text = groupName.substring(0,index1)+"("+num+")";
-							count = 0;
-						}else{
-							alert("<fmt:message key="error.grouping.data"/>"+" "+addmbrsRequest.status);
-						}
-					ajustButtonStatus();
-				}
-		}
-
-		
-		function removeMembersFromGroup(){
-			var membersSelectObj = document.getElementById("members[]");
-			var nonmembers = "";
-			for(i=0; i<membersSelectObj.length; i++){
-				if(membersSelectObj.options[i].selected){
-					count++;
-					nonmembers = nonmembers + "," + membersSelectObj.options[i].value;
-				}	
-			}
-			url="<lams:LAMSURL/>monitoring/grouping.do?method=removeMembers&activityID=<c:out value="${activityID}"/>&groupID="+document.getElementById("groups").value+"&members="+nonmembers.substr(1);
-			if (window.XMLHttpRequest) { // Non-IE browsers
-					rmmbrsRequest = new XMLHttpRequest();
-					rmmbrsRequest.onreadystatechange = membersRemoved;
-					try {
-							rmmbrsRequest.open("GET", url, true);
-					} catch (e) {
-							alert(e);
-					}
-					rmmbrsRequest.setRequestHeader("Content-Type", "text/plain;charset=UTF-8");
-					rmmbrsRequest.send(null);
-			} else if (window.ActiveXObject) { // IE
-					rmmbrsRequest = new ActiveXObject("Microsoft.XMLHTTP");
-					if (rmmbrsRequest) {
-							rmmbrsRequest.onreadystatechange = membersRemoved;
-							rmmbrsRequest.open("GET", url, true);
-							rmmbrsRequest.send();
-					}
-			}
-		}
-
-		function membersRemoved(){
-			if (rmmbrsRequest.readyState == 4) { // Complete
-					if (rmmbrsRequest.status == 200) { // OK response
-						checkForErrorScreen("<fmt:message key="error.grouping.data"/>", rmmbrsRequest.responseText);
-						getMembers(document.getElementById("groups"));
-						getNonmembers(document.getElementById("groupings"));
-						var groupSelectObj = document.getElementById("groups");
-						var groupName = groupSelectObj.options[groupSelectObj.selectedIndex].text;
-						var index1 = groupName.lastIndexOf("(");
-						var index2 = groupName.lastIndexOf(")");
-						var num = groupName.substring(index1+1,index2);
-						num = parseInt(num) - count;
-						groupSelectObj.options[groupSelectObj.selectedIndex].text = groupName.substring(0,index1)+"("+num+")";
-						count = 0;
-					}else{
-						alert("<fmt:message key="error.grouping.data"/>"+" "+rmmbrsRequest.status);
-					}
-			ajustButtonStatus();
-			}
-		}	
-
-		function displayLoadingMessage() {
-			document.getElementById("message").innerHTML = "<fmt:message key="label.grouping.loading"/>";
-		}
-
-		function clearMessage() {
-			document.getElementById("message").innerHTML = "";
-		}
-		
-	//-->
 	</script>
-
-	  <NOSCRIPT><!--This browser doesn't supports scripting--></NOSCRIPT>
 	
 </lams:head>
 
-<body class="stripes" onLoad="init()">
+<body class="stripes">
 
 	<div id="content">
 
@@ -476,49 +75,82 @@
 	<c:if test="${usedForBranching}">
 	<p><fmt:message key="label.grouping.general.instructions.branching"/></p>
 	</c:if>
-
-	<table class="chosengrouping">
-		<tr>
-			<th><fmt:message key="label.grouping.group.heading"/></th>
-			<th><fmt:message key="label.grouping.non.grouped.users.heading"/></th>
-			<th><fmt:message key="label.grouping.grouped.users.heading"/></th>
-   		 </tr>
-		<tr>
-			<td width="34%">
-				<select id="groups" name="groups" size="15" onChange="getMembers(this)">
-				</select>
-			</td >
-			<td width="33%">
-				<select  id="nonmembers[]" name="nonmembers[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
-				</select>
-			</td>
-			<td width="33%">
-				<select  id="members[]" name="members[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td width="34%">
-				<input type="button" class="button" id="groupremove" name="groupremove" value="<fmt:message key="button.grouping.remove.selected.group"/>" onclick="removeGroup()" disabled="true"/>
-			</td>
-			<td width="33%">
-				<input type="button" class="button"  id="nonmembersadd" name="nonmembersadd" value="<fmt:message key="button.grouping.add.user.to.group"/>" onclick="addMembersToGroup()" disabled="true"/>
-			</td>
-			<td width="33%">
-				   <input type="button" class="button" id="membersremove" name="membersremove" value="<fmt:message key="button.grouping.remove.user.from.group"/>" onclick="removeMembersFromGroup()" disabled="true"/>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="3">
-				<input type="text" name="newgroupname" id="newgroupname" size="25"  /><br>
-				<input type="button" class="button" id="groupadd" name="groupadd" value="<fmt:message key="button.grouping.add.group"/>" onclick="addGroup()"  />
-			</td>
-		</tr>
-	</table>
-	<%@ include file="../template/finishbutton.jsp" %>
-	</form>
-
+	
+	<div align="center">
+	<script language="JavaScript" type="text/javascript">
+		// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+		var hasProductInstall = DetectFlashVer(6, 0, 65);
+		
+		// Version check based upon the values defined in globals
+		var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+		
+		if ( hasProductInstall && !hasRequestedVersion ) {
+			// DO NOT MODIFY THE FOLLOWING FOUR LINES
+			// Location visited after installation is complete if installation is required
+			var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+			var MMredirectURL = window.location;
+		    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+		    var MMdoctitle = document.title;
+		
+			AC_FL_RunContent(
+				"src", "playerProductInstall",
+				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+				"width", "827",
+				"height", "502",
+				"align", "middle",
+				"id", "LamsLessonGroupManager",
+				"quality", "high",
+				"bgcolor", "#ffffff",
+				"name", "GroupManager",
+				"allowScriptAccess","sameDomain",
+				"type", "application/x-shockwave-flash",
+				"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		} else if (hasRequestedVersion) {
+			// if we've detected an acceptable version
+			// embed the Flash Content SWF when all tests are passed
+			AC_FL_RunContent(
+					"src", "GroupManager",
+					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+					"width", "827",
+					"height", "502",
+					"align", "middle",
+					"id", "GroupManager",
+					"quality", "high",
+					"bgcolor", "#ffffff",
+					"name", "GroupManager",
+					"allowScriptAccess","sameDomain",
+					"type", "application/x-shockwave-flash",
+					"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		  } else {  // flash is too old or we can't detect the plugin
+		    var alternateContent = 'Alternate HTML content should be placed here. '
+		  	+ 'This content requires the Adobe Flash Player. '
+		   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+		    document.write(alternateContent);  // insert non-flash content
+		  }
+	</script>
+	<noscript>
+	  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+				id="LamsLessonGroupManager" width="827" height="502"
+				codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+				<param name="movie" value="LamsLessonGroupManager.swf" />
+				<param name="quality" value="high" />
+				<param name="bgcolor" value="#ffffff" />
+				<param name="allowScriptAccess" value="sameDomain" />
+				<embed src="LamsLessonGroupManager.swf" quality="high" bgcolor="#869ca7"
+					width="827" height="502" name="LamsLessonGroupManager" align="middle"
+					play="true"
+					loop="false"
+					quality="high"
+					allowScriptAccess="sameDomain"
+					type="application/x-shockwave-flash"
+					pluginspage="http://www.adobe.com/go/getflashplayer">
+				</embed>
+		</object>
+	</noscript>
 	</div>
+	</div>
 
 	<div id="footer">
 	</div><!--closes footer-->
Index: lams_monitoring/web/grouping/viewGroups.jsp
===================================================================
diff -u -rc209be8131f22f6fe37bd8d6c14b56425a78b766 -redba2c28d900fba6e7bb761fb0a828aad979629e
--- lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision c209be8131f22f6fe37bd8d6c14b56425a78b766)
+++ lams_monitoring/web/grouping/viewGroups.jsp	(.../viewGroups.jsp)	(revision edba2c28d900fba6e7bb761fb0a828aad979629e)
@@ -26,7 +26,18 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+<script src="<lams:LAMSURL/>includes/javascript/AC_OETags.js" type="text/javascript"></script>
 
+<script type="text/javascript">
+	var requiredMajorVersion = 9;
+	var requiredMinorVersion = 0;
+	var requiredRevision = 124;
+
+	function closeWindow(){
+		window.close();
+	}
+</script>
+	
 <div id="content">
 
 	<h1><c:out value="${title}"/></h1>
@@ -36,31 +47,80 @@
 		<p><c:out value="${description}"/></p>
 	</c:if>
 
-	<c:choose>
-	<c:when test="${empty groups}">
-		<p><fmt:message key="label.grouping.no.groups.created"/></p>
-	</c:when>
-	<c:otherwise>
-	
-	
-		<table class="alternative-color" cellspacing="0">
-			<c:forEach items="${groups}" var="group">
-			<tr>
-				<td width="25%" class="first">
-					<c:out value="${group.groupName}"/>
-				</td>
-				<td>
-					<c:forEach items="${group.users}" var="user">
-						<c:out value="${user.firstName}"/> <c:out value="${user.lastName}"/><br />
-					</c:forEach>
-				</td>
-			</tr>
-			</c:forEach>
-		</table>
-	</c:otherwise>
-	</c:choose>
+	<div align="center">
+	<script language="JavaScript" type="text/javascript">
+		// Version check for the Flash Player that has the ability to start Player Product Install (6.0r65)
+		var hasProductInstall = DetectFlashVer(6, 0, 65);
 		
-	<%@ include file="../template/finishbutton.jsp" %>
+		// Version check based upon the values defined in globals
+		var hasRequestedVersion = DetectFlashVer(requiredMajorVersion, requiredMinorVersion, requiredRevision);
+		
+		if ( hasProductInstall && !hasRequestedVersion ) {
+			// DO NOT MODIFY THE FOLLOWING FOUR LINES
+			// Location visited after installation is complete if installation is required
+			var MMPlayerType = (isIE == true) ? "ActiveX" : "PlugIn";
+			var MMredirectURL = window.location;
+		    document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+		    var MMdoctitle = document.title;
+		
+			AC_FL_RunContent(
+				"src", "playerProductInstall",
+				"FlashVars", "MMredirectURL="+MMredirectURL+'&MMplayerType='+MMPlayerType+'&MMdoctitle='+MMdoctitle+'&lessonID='+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+				"width", "827",
+				"height", "502",
+				"align", "middle",
+				"id", "LamsLessonGroupManager",
+				"quality", "high",
+				"bgcolor", "#ffffff",
+				"name", "GroupManager",
+				"allowScriptAccess","sameDomain",
+				"type", "application/x-shockwave-flash",
+				"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		} else if (hasRequestedVersion) {
+			// if we've detected an acceptable version
+			// embed the Flash Content SWF when all tests are passed
+			AC_FL_RunContent(
+					"src", "GroupManager",
+					"FlashVars", "lessonID="+'${lessonID}'+'&activityID='+'${activityID}'+'&serverUrl=<lams:LAMSURL/>'+'&mayDelete='+'${mayDelete}'+'&usedForBranching='+'${usedForBranching}'+'&maxNumberOfGroups='+'${maxNumberOfGroups}'+'&languageXML='+"${languageXML}"+"",
+					"width", "827",
+					"height", "502",
+					"align", "middle",
+					"id", "GroupManager",
+					"quality", "high",
+					"bgcolor", "#ffffff",
+					"name", "GroupManager",
+					"allowScriptAccess","sameDomain",
+					"type", "application/x-shockwave-flash",
+					"pluginspage", "http://www.adobe.com/go/getflashplayer"
+			);
+		  } else {  // flash is too old or we can't detect the plugin
+		    var alternateContent = 'Alternate HTML content should be placed here. '
+		  	+ 'This content requires the Adobe Flash Player. '
+		   	+ '<a href=http://www.adobe.com/go/getflash/>Get Flash</a>';
+		    document.write(alternateContent);  // insert non-flash content
+		  }
+	</script>
+	<noscript>
+	  	<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+				id="LamsLessonGroupManager" width="827" height="502"
+				codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
+				<param name="movie" value="LamsLessonGroupManager.swf" />
+				<param name="quality" value="high" />
+				<param name="bgcolor" value="#ffffff" />
+				<param name="allowScriptAccess" value="sameDomain" />
+				<embed src="LamsLessonGroupManager.swf" quality="high" bgcolor="#869ca7"
+					width="827" height="502" name="LamsLessonGroupManager" align="middle"
+					play="true"
+					loop="false"
+					quality="high"
+					allowScriptAccess="sameDomain"
+					type="application/x-shockwave-flash"
+					pluginspage="http://www.adobe.com/go/getflashplayer">
+				</embed>
+		</object>
+	</noscript>
+	</div>
 
 </div>  <!--closes content-->