Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r77deb8f0850b92b8de8bbecd08f011b6450c00ea -rd700d385658a5b88ec3e45d2bdae50a505cfe61d
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r77deb8f0850b92b8de8bbecd08f011b6450c00ea -rd700d385658a5b88ec3e45d2bdae50a505cfe61d
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r040a7f802674100a097d8bf608a718165a4a4104 -rd700d385658a5b88ec3e45d2bdae50a505cfe61d
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 040a7f802674100a097d8bf608a718165a4a4104)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision d700d385658a5b88ec3e45d2bdae50a505cfe61d)
@@ -672,6 +672,14 @@
 	 * @return  
 	 */
 	private function showAppliedGroupingControls(v:Boolean, e:Boolean){
+		if(_canvasModel.selectedItem.activity.activityTypeID != Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
+			grouping_lbl._y = 52;
+			appliedGroupingActivity_cmb._y = 52;
+		} else {
+			grouping_lbl._y = 75;
+			appliedGroupingActivity_cmb._y = 75;
+		}
+			
 		grouping_lbl.visible = v;
 		appliedGroupingActivity_cmb.visible = v;
 		
@@ -791,6 +799,10 @@
 				branchType_cmb.selectedIndex=i;
 			}
 		}
+		
+		if(_canvasModel.selectedItem.activity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
+			showAppliedGroupingControls(true, !ba.readOnly);
+		}
 	
 	}
 	
@@ -1133,6 +1145,20 @@
 		_canvasModel.selectedItem.activity.activityTypeID = evt.target.value;
 		Debugger.log('Set branch type to: _canvasModel.selectedItem.activity.activityTypeID:'+_canvasModel.selectedItem.activity.activityTypeID,Debugger.GEN,'onBranchTypeChange','PropertyInspector');
 		
+		if(evt.target.value == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
+			var selectedGroup = appliedGroupingActivity_cmb.dataProvider[appliedGroupingActivity_cmb.selectedIndex].data;
+			if(selectedGroup != null) {
+				_canvasModel.selectedItem.activity.groupingUIID = selectedGroup.createGroupingUIID;
+			}
+				
+			showAppliedGroupingControls(true, !_canvasModel.selectedItem.activity.readOnly);
+		} else {
+			_canvasModel.selectedItem.activity.groupingUIID = null;
+			showAppliedGroupingControls(false);
+		}
+		
+		_canvasModel.selectedItem.refresh();
+		
 		setModified();
 	}
 	
@@ -1160,7 +1186,6 @@
 		a.activity.groupingUIID = newGroupingUIID;
 		if (a.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 			for (var k=0; k<a.actChildren.length; k++){
-				trace("Child has title : "+a.actChildren[k].title)
 				a.actChildren[k].groupingUIID = newGroupingUIID;
 			}
 			a.init();
@@ -1259,5 +1284,10 @@
 		ApplicationParent.extCall("setSaved", "false");
 	}
 	
+	private function moveItem(item:Object, xDiff:Number, yDiff:Number) {
+		item._x += xDiff;
+		item._y += yDiff;
+	}
+	
 }