Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r4ae1c2066c754555f8ae260a052cc9a706a747f4 -r7955216f858ed1e0e6a38abef06b770af3326ad3
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r4ae1c2066c754555f8ae260a052cc9a706a747f4 -r7955216f858ed1e0e6a38abef06b770af3326ad3
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as
===================================================================
diff -u -rc519cdd55a51de98ac7e09348f1eac36f5369263 -r7955216f858ed1e0e6a38abef06b770af3326ad3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as	(.../GroupBranchActivityEntry.as)	(revision c519cdd55a51de98ac7e09348f1eac36f5369263)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as	(.../GroupBranchActivityEntry.as)	(revision 7955216f858ed1e0e6a38abef06b770af3326ad3)
@@ -54,7 +54,7 @@
 		if(_entryUIID) dto.entryUIID = _entryUIID;
 		if(_group) dto.groupUIID = _group.groupUIID;
 		if(_sequenceActivity) dto.sequenceActivityUIID = _sequenceActivity.activityUIID;
-		if(_branchingActivity) dto.branchActivityUIID = _branchingActivity.activityUIID;
+		if(_branchingActivity) dto.branchingActivityUIID = _branchingActivity.activityUIID;
 		
 		return dto;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
===================================================================
diff -u -r4ae1c2066c754555f8ae260a052cc9a706a747f4 -r7955216f858ed1e0e6a38abef06b770af3326ad3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	(.../Grouping.as)	(revision 4ae1c2066c754555f8ae260a052cc9a706a747f4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	(.../Grouping.as)	(revision 7955216f858ed1e0e6a38abef06b770af3326ad3)
@@ -127,6 +127,9 @@
 		
 		dto.groups = new Array();
 		
+		var groupTotal = (groupingTypeID == RANDOM_GROUPING) ? numberOfGroups : maxNumberOfGroups;
+		if(groupTotal == 0) _groups.clear();
+			
 		var groups:Array = _groups.values();
 		if(groups.length > 0){
 			for(var i=0; i<groups.length; i++){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as
===================================================================
diff -u -rc519cdd55a51de98ac7e09348f1eac36f5369263 -r7955216f858ed1e0e6a38abef06b770af3326ad3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as	(.../GroupNamingDialog.as)	(revision c519cdd55a51de98ac7e09348f1eac36f5369263)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as	(.../GroupNamingDialog.as)	(revision 7955216f858ed1e0e6a38abef06b770af3326ad3)
@@ -51,8 +51,7 @@
 	private var _grouping:Grouping;
 	private var _changedGroups:Hashtable;
 	
-    private var ok_btn:Button;         //OK+Cancel buttons
-    private var cancel_btn:Button;
+    private var close_btn:Button;         // Close button
     
 	private var instructions_lbl:Label;
 	private var _group_naming_dgd:DataGrid;
@@ -97,18 +96,17 @@
         themeManager = ThemeManager.getInstance();
         
         //Set the text for buttons
-        ok_btn.label = Dictionary.getValue('al_ok');
-        cancel_btn.label = Dictionary.getValue('al_cancel');
-		instructions_lbl.text = "Changes names for Groups";
+        close_btn.label = Dictionary.getValue('al_ok');
+        instructions_lbl.text = Dictionary.getValue('groupnaming_dialog_instructions_lbl');
 		
         //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
         fm = _container.getFocusManager();
         fm.enabled = true;
         
         //EVENTS
         //Add event listeners for ok, cancel and close buttons
-        ok_btn.addEventListener('click',Delegate.create(this, ok));
-        cancel_btn.addEventListener('click',Delegate.create(this, cancel));
+        close_btn.addEventListener('click',Delegate.create(this, close));
+		
 		_group_naming_dgd.addEventListener('cellEdit', Delegate.create(this, itemEdited));
 		_group_naming_dgd.addEventListener('cellFocusIn', Delegate.create(this, itemSelected));
 
@@ -118,10 +116,8 @@
         _container.addEventListener('size',this);
         
         //work out offsets from bottom RHS of panel
-        xOkOffset = _bgpanel._width - ok_btn._x;
-        yOkOffset = _bgpanel._height - ok_btn._y;
-        xCancelOffset = _bgpanel._width - cancel_btn._x;
-        yCancelOffset = _bgpanel._height - cancel_btn._y;
+        xOkOffset = _bgpanel._width - close_btn._x;
+        yOkOffset = _bgpanel._height - close_btn._y;
         
         //Register as listener with StyleManager and set Styles
         themeManager.addEventListener('themeChanged',this);
@@ -189,28 +185,20 @@
 
         //Get the button style from the style manager and apply to both buttons
         styleObj = themeManager.getStyleObject('button');
-        ok_btn.setStyle('styleName', styleObj);
-        cancel_btn.setStyle('styleName', styleObj);
-		
+        close_btn.setStyle('styleName', styleObj);
+       
 		styleObj = themeManager.getStyleObject('CanvasPanel');
 		_bgpanel.setStyle('styleName', styleObj);
 		
         //Apply label style 
         styleObj = themeManager.getStyleObject('label');
         instructions_lbl.setStyle('styleName', styleObj);
-    }
-
+    }
+	
     /**
-    * Called by the cancel button 
-    */
-    private function cancel(){
-        _container.deletePopUp();
-    }
-    
-    /**
     * Called by the OK button 
     */
-    private function ok(){
+    private function close(){
 		_grouping.updateGroups(_changedGroups.values());
         _container.deletePopUp();
     }
@@ -230,8 +218,8 @@
         _bgpanel.setSize(w,h);
 
         //Buttons
-        ok_btn.move(w-xOkOffset,h-yOkOffset);
-        cancel_btn.move(w-xCancelOffset,h-yCancelOffset);
+        close_btn.move(w-xOkOffset,h-yOkOffset);
+		
     }
     
     //Gets+Sets
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r7955216f858ed1e0e6a38abef06b770af3326ad3
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as	(.../ILayoutManager.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as	(.../ILayoutManager.as)	(revision 7955216f858ed1e0e6a38abef06b770af3326ad3)
@@ -65,5 +65,4 @@
 
 	public function resize(w:Number, h:Number);
 	
-	//public function completed():Boolean;
 }
\ No newline at end of file