Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r7955216f858ed1e0e6a38abef06b770af3326ad3 -r0267a9238f122504943b400c11ca0fa751698aba
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r7955216f858ed1e0e6a38abef06b770af3326ad3 -r0267a9238f122504943b400c11ca0fa751698aba
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r4ae1c2066c754555f8ae260a052cc9a706a747f4 -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 4ae1c2066c754555f8ae260a052cc9a706a747f4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -715,7 +715,7 @@
 		
 		if(classGroups.length > 0)
 			for(var i=0; i<classGroups.length; i++)
-				design.groupings[i] = classGroups[i].toData();
+				design.groupings[i] = classGroups[i].toData(this);
 				
 				
 		design.branchMappings = new Array();
@@ -829,7 +829,7 @@
 	}
 	
 	public function getGroupByUIID(groupUIID:Number):Group {
-		var groupings = _groupings.values();
+		var groupings:Array = _groupings.values();
 		
 		for(var i=0; i<groupings.length; i++) {
 			var group:Group = Group(groupings[i].getGroup(groupUIID));
@@ -839,6 +839,35 @@
 		return null;
 	}
 	
+	public function hasBranchMappingsForGroupingUIID(groupingUIID:Number):Boolean {
+		var bMappings:Array = _branchMappings.values();
+		Debugger.log("checking for branch mappings", Debugger.CRITICAL, "hasBranch*", "DDM");
+		for(var i=0; i<bMappings.length; i++) {
+			Debugger.log("parentID: " + bMappings[i].group.parentID, Debugger.CRITICAL, "hasBranch*", "DDM");
+		
+			if(bMappings[i].group.parentID == groupingUIID) return true;
+		}
+		
+		return false;
+	}
+	
+	public function clearBranchMappingsByGroupingUIID(groupingUIID:Number):Void {
+		var bMappings:Array = _branchMappings.values();
+		
+		for(var i=0; i<bMappings.length; i++) {
+			if(bMappings[i].group.parentID == groupingUIID) _branchMappings.remove(bMappings[i].entryUIID);
+		}
+	}
+	
+	public function removeBranchMappingsByGroupUIID(groupUIID:Number):Void {
+		var bMappings:Array = _branchMappings.values();
+		
+		for(var i=0; i<bMappings.length; i++) {
+			if(bMappings[i].group.groupUIID == groupUIID) _branchMappings.remove(bMappings[i].entryUIID);
+		}
+	}
+	
+	
 	/**
 	 * Retrieves all children of a complexy activity
 	 * E.g. child acts in an optional activity
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as
===================================================================
diff -u -rc519cdd55a51de98ac7e09348f1eac36f5369263 -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as	(.../Group.as)	(revision c519cdd55a51de98ac7e09348f1eac36f5369263)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as	(.../Group.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -29,13 +29,15 @@
  * @version 2.1
  **/
 class Group {
-	
+	
+	private var _parentID:Number;
 	private var _groupID:Number;
 	private var _groupUIID:Number;
 	private var _groupName:String;
 	private var _orderID:Number;
 	
-	function Group(groupID, groupUIID, groupName, orderID){
+	function Group(parentID, groupID, groupUIID, groupName, orderID){
+		_parentID = parentID;
 		_groupID = groupID;
 		_groupUIID = groupUIID;
 		_groupName = groupName;
@@ -52,6 +54,14 @@
 		
 		return dto;
 	}
+	
+	public function get parentID():Number {
+		return _parentID;
+	}
+	
+	public function set parentID(a:Number) {
+		_parentID = a;
+	}
 	
 	public function get groupID():Number {
 		return _groupID;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
===================================================================
diff -u -r7955216f858ed1e0e6a38abef06b770af3326ad3 -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	(.../Grouping.as)	(revision 7955216f858ed1e0e6a38abef06b770af3326ad3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	(.../Grouping.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -91,10 +91,8 @@
 			var gdto = groups[i];
 			if(gdto.groupUIID == null) gdto.groupUIID = Application.getInstance().getCanvas().ddm.newUIID();
 			
-			var newGroup = new Group(gdto.groupID, gdto.groupUIID, gdto.groupName, gdto.orderID);
-			
-			
-			
+			var newGroup = new Group(this.groupingUIID, gdto.groupID, gdto.groupUIID, gdto.groupName, gdto.orderID);
+
 			_groups.put(newGroup.groupUIID, newGroup);
 		}
 	}
@@ -116,7 +114,7 @@
 	 * @usage   
 	 * @return  
 	 */
-	public function toData():Object{
+	public function toData(_ddm:DesignDataModel):Object{
 		var dto:Object = new Object();
 		if(_groupingID){		dto.groupingID = _groupingID;				}
 		if(_groupingUIID){		dto.groupingUIID = _groupingUIID;			}
@@ -130,7 +128,8 @@
 		var groupTotal = (groupingTypeID == RANDOM_GROUPING) ? numberOfGroups : maxNumberOfGroups;
 		if(groupTotal == 0) _groups.clear();
 			
-		var groups:Array = _groups.values();
+		var groups:Array = getGroups(_ddm);
+		
 		if(groups.length > 0){
 			for(var i=0; i<groups.length; i++){
 				dto.groups[i] = groups[i].toData();
@@ -143,19 +142,22 @@
 	public function getGroups(_ddm:DesignDataModel):Array {
 		var groupTotal = (groupingTypeID == RANDOM_GROUPING) ? numberOfGroups : maxNumberOfGroups;
 		var groupDiff:Number = groupTotal - _groups.size();
+		
 		var groups = _groups.values();
+		groups.sortOn("groupUIID", Array.NUMERIC);
 		
 		if(_groups.size() == groupTotal && _groups.size() > 0)
 			return groups;
 		
 		if(groupDiff >= 0) {
 			for(var i=0; i<groupDiff; i++) {
-				var group = (groups.length > 0) ? new Group(null, _ddm.newUIID(), "Group " + Number(groups.length + i + 1), Number(groups.length+i))
-												: new Group(null, _ddm.newUIID(), "Group " + Number(i+1), i);
+				var group = (groups.length > 0) ? new Group(this.groupingUIID, null, _ddm.newUIID(), "Group " + Number(groups.length + i + 1), Number(groups.length+i))
+												: new Group(this.groupingUIID, null, _ddm.newUIID(), "Group " + Number(i+1), i);
 				addGroup(group);
 			}
 		} else {
 			for(var i=-1; i>=groupDiff; i--) {
+				_ddm.removeBranchMappingsByGroupUIID(groups[groups.length+i].groupUIID);
 				_groups.remove(groups[groups.length+i].groupUIID);
 			}
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
===================================================================
diff -u -rc519cdd55a51de98ac7e09348f1eac36f5369263 -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as	(.../GroupMatchingDialog.as)	(revision c519cdd55a51de98ac7e09348f1eac36f5369263)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as	(.../GroupMatchingDialog.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -167,8 +167,18 @@
 		
 		for(var m in mappings) {
 			match_dgd.addItem(mappings[m]);
+			removeGroup(mappings[m].group);
 		}
 	}
+	
+	private function removeGroup(g:Group) {
+		var indexList:Array = new Array();
+		
+		for(var i=0; i<groups_lst.rowCount; i++) {
+			var item = groups_lst.getItemAt(i);
+			if(item.groupUIID == g.groupUIID) { groups_lst.removeItemAt(i); return; }
+		}
+	}
     
     /**
     * Event fired by StyleManager class to notify listeners that Theme has changed
@@ -219,22 +229,28 @@
     }
 	
 	private function addMatch():Void {
+		var selectedGroups:Array = new Array();
+		
 		// get selected items and put together in match
 		if(groups_lst.selectedItems.length > 0) {
-			
-			for(var i=0; i< groups_lst.selectedItems.length; i++) {
+		
+			for(var i=0; i<groups_lst.selectedIndices.length; i++) {
 				if(branches_lst.selectedItem != null) {
-					setupMatch(groups_lst.selectedItems[i], branches_lst.selectedItem);
+					setupMatch(groups_lst.getItemAt(groups_lst.selectedIndices[i]), branches_lst.selectedItem);
+					selectedGroups.push(groups_lst.selectedIndices[i]);
 				} else {
 					LFMessage.showMessageAlert("No branch selected");
 					return;
 				}
-;			}
-			
-			for(var index in groups_lst.selectedIndices) {
-				groups_lst.removeItemAt(groups_lst.selectedIndices[index]);
+				
 			}
+			var delCount = 0;
+			for(var i=0; i<selectedGroups.length; i++) {
+				groups_lst.removeItemAt(selectedGroups[i]-delCount);
+				delCount++;
+			}
 			
+			
 		} else {
 			LFMessage.showMessageAlert("No groups selected");
 		}
@@ -259,7 +275,7 @@
 			groups_lst.sortItemsBy("groupUIID", Array.NUMERIC);
 			
 			match_dgd.removeItemAt(match_dgd.selectedIndex);
-			app.getCanvas().ddm.removeBranchMapping(rItem);
+			app.getCanvas().ddm.removeBranchMapping(rItem.entryUIID);
 			
 		} else {
 			LFMessage.showMessageAlert("No match selected");
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rddbaafba98df3c2f503d7f8cdb755d9f5194dfd0 -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision ddbaafba98df3c2f503d7f8cdb755d9f5194dfd0)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -490,7 +490,7 @@
 		branchRelease(bc);
 	}
    
-	private function setBusy():Void{
+	public function setBusy():Void{
 		if(_isBusy){
 			//Debugger.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!',1,'checkBusy','org.lamsfoundation.lams.common.util.Hashtable');
 			//Debugger.log('!!!!!!!!!!!!!!!!!!!! HASHTABLE ACCESED WHILE BUSY !!!!!!!!!!!!!!!!',1,'checkBusy','org.lamsfoundation.lams.common.util.Hashtable');
@@ -499,11 +499,15 @@
 		_isBusy=true;
 	}
 	
-	private function clearBusy():Void{
+	public function clearBusy():Void{
 		_isBusy=false;
 	}
 	
+	public function get isBusy():Boolean {
+		return _isBusy;
+	}
 	
+	
 	/**
 	 * Transition Properties OK Handler
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rc09edcc3e54b8a8324169e0877b057b3abb8b483 -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision c09edcc3e54b8a8324169e0877b057b3abb8b483)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -493,38 +493,6 @@
 		
 	}
 	
-	private function  populateGroupingProperties(ga:GroupingActivity){
-		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
-		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_activity_type_grouping');
-		
-		Debugger.log('This is the grouping object:',Debugger.GEN,'populateGroupingProperties','PropertyInspector');
-		ObjectUtils.printObject(g);
-		
-		//loop through combo to fins SI of our gate activity type
-		for (var i=0; i<groupType_cmb.dataProvider.length;i++){
-			if(g.groupingTypeID == groupType_cmb.dataProvider[i].data){
-				groupType_cmb.selectedIndex=i;
-			}
-		}
-		
-		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
-			if(g.learnersPerGroup != null){
-				numLearners_stp.value = g.learnersPerGroup;
-			}else if(g.numberOfGroups != null){
-				numRandomGroups_stp.value = g.numberOfGroups;
-				_group_naming_btn.enabled = (numRandomGroups_stp.value > 0) ? true : false;
-			}
-		}else{
-			if(g.maxNumberOfGroups != null){
-				numGroups_stp.value = g.maxNumberOfGroups;
-				_group_naming_btn.enabled = (numGroups_stp.value > 0) ? true : false;
-			} else {
-				_group_naming_btn.enabled = false;
-			}
-		}
-		
-	}
-	
 	/**
 	 * Shows which grouping activity is applied to this activity, 
 	 * if you click the edit button, the the activity is selected, 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -rc519cdd55a51de98ac7e09348f1eac36f5369263 -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision c519cdd55a51de98ac7e09348f1eac36f5369263)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -534,8 +534,10 @@
 	 * @return  
 	 */
 	private function checkEnableGroupsOptions(e:Boolean){
-		var groupingBy = rndGroup_radio.selection.data;
+		var groupingBy = rndGroup_radio.selection.data;
+		
 		Debugger.log('groupingBy:'+groupingBy,Debugger.GEN,'checkEnableGroupsOptions','PropertyInspector');
+		
 		if(groupingBy == 'num_learners'){
 			numRandomGroups_stp.value = 0;
 			numRandomGroups_stp.enabled = false;
@@ -546,38 +548,100 @@
 			numRandomGroups_stp.enabled = (e != null) ? e : true;
 			numLearners_stp.value = 0;
 			numLearners_stp.enabled = false;
-			
-			_group_naming_btn.enabled = (e != null && numRandomGroups_stp.value > 0) ? e : true;
+	
+			_group_naming_btn.enabled = (e != null) ? e : true;
 		}
 		
 		//this is a crazy hack to stop the steppter dissapearing after its .enabled property is set.
 		//waits 2 frames to re-display the control ( 1 doensnt work!)
 		MovieClipUtils.doLater(Proxy.create(this,reDrawTroublesomeSteppersLater));
 		
-	}
+	}
 	
 	public function reDrawTroublesomeSteppersLater(){
 		MovieClipUtils.doLater(Proxy.create(this,reDrawTroublesomeSteppers));
-	}
+	}
+	
+	private function  populateGroupingProperties(ga:GroupingActivity){
+		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		toolDisplayName_lbl.text = "<b>"+Dictionary.getValue('pi_title')+"</b> - "+Dictionary.getValue('pi_activity_type_grouping');
+		
+		Debugger.log('This is the grouping object:',Debugger.GEN,'populateGroupingProperties','PropertyInspector');
+		ObjectUtils.printObject(g);
+		
+		//loop through combo to fins SI of our gate activity type
+		for (var i=0; i<groupType_cmb.dataProvider.length;i++){
+			if(g.groupingTypeID == groupType_cmb.dataProvider[i].data){
+				groupType_cmb.selectedIndex=i;
+			}
+		}
+		
+		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
+			if(g.learnersPerGroup != null){
+				numLearners_stp.value = g.learnersPerGroup;
+			}else if(g.numberOfGroups != null){
+				numRandomGroups_stp.value = g.numberOfGroups;
+			}
+		}else{
+			if(g.maxNumberOfGroups != null){
+				numGroups_stp.value = g.maxNumberOfGroups;
+			}
+		}
+		
+	}
 	
 	/**
 	 * Called when there is a change in the values of the group method steppers
 	 * Butdates the value inthe grouping class being edited.
 	 * @usage   
 	 * @return  
 	 */
-	public function updateGroupingMethodData(){
-		var ga = _canvasModel.selectedItem.activity;
-		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
-		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
-			//not only one of these should actually have a non 0 value
-			g.learnersPerGroup = numLearners_stp.value;
-			g.numberOfGroups = numRandomGroups_stp.value;
-		}else{
-			g.maxNumberOfGroups = numGroups_stp.value;
+	public function updateGroupingMethodData(evt:Object){
+		var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID);
+		
+		Debugger.log("updating grouping method data: " + g.groupingUIID, Debugger.CRITICAL, "updateGroupingMethodData", "PropertyInspectorControls");
+		
+		if(!_canvasController.isBusy && evt.type == 'focusOut') {
+			if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID)) {
+				_canvasController.setBusy();
+			
+				LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, doUpdateGroupingMethodData, g), Proxy.create(this, retainOldGroupingMethodData), "Yes", "No",  "Warning");
+			} else {
+				doUpdateGroupingMethodData(g);
+			}
 		}
-		
-		setModified();
+	}
+	
+	private function doUpdateGroupingMethodData(g:Grouping) {
+		
+		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
+			//note only one of these should actually have a non 0 value
+			g.learnersPerGroups = numLearners_stp.value;
+			g.numberOfGroups = numRandomGroups_stp.value;
+			
+		}else{
+			g.maxNumberOfGroups = numGroups_stp.value;
+		}
+				
+		setModified();
+		
+		_canvasController.clearBusy();
+		
+	}
+	
+	public function retainOldGroupingMethodData(){
+		var ga = _canvasModel.selectedItem.activity;
+		var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
+		
+		if(g.groupingTypeID == Grouping.RANDOM_GROUPING){
+			numLearners_stp.value = (g.learnersPerGroups == null) ? 0 : g.learnersPerGroups;
+			numRandomGroups_stp.value = (g.numberOfGroups == null) ? 0 : g.numberOfGroups;
+		} else{
+			numGroups_stp.value = (g.maxNumberOfGroups == null) ? 0 : g.maxNumberOfGroups;
+		}
+		
+		_canvasController.clearBusy();
+		
 	}
 	
 	private function getGroupingActivitiesDP(){
@@ -597,8 +661,6 @@
 		return gActsDP;
 	}
 	
-	
-	
 
 	/**
     * Main resize method, called by scrollpane container/parent
@@ -746,15 +808,28 @@
 	 * @param   evt 
 	 * @return  
 	 */
-	private function onGroupTypeChange(evt:Object){
-		var ga = _canvasModel.selectedItem.activity;
-		var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID);
-		g.groupingTypeID = evt.target.value;
-		Debugger.log('Set group type to: '+g.groupingTypeID,Debugger.GEN,'onGroupTypeChange','PropertyInspector');
-		showRelevantGroupOptions(!ga.readOnly);
+	private function onGroupTypeChange(evt:Object){
+		var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID);
+		
+		Debugger.log('groupingUIID: '+g.groupingUIID,Debugger.GEN,'onGroupTypeChange','PropertyInspector');
+		
+		if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID))
+			LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, updateGroupingType, g, evt.target.value), Proxy.create(this, populateGroupingProperties, _canvasModel.selectedItem.activity), "Yes", "No",  "Warning");
+		else {	
+			updateGroupingType(g, evt.target.value);
+		}
 		
-		setModified();
 	}
+	
+	private function updateGroupingType(g:Grouping, typeID:Number) {
+		g.groupingTypeID = typeID;
+		
+		Debugger.log('Set group type to: '+g.groupingTypeID,Debugger.GEN,'onGroupTypeChange','PropertyInspector');
+		showRelevantGroupOptions(!_canvasModel.selectedItem.activity.readOnly);
+		doUpdateGroupingMethodData(g);
+		
+		setModified();
+	}
 	
 	private function onAppliedGroupingChange(evt:Object){
 		var a = _canvasModel.selectedItem;
@@ -840,7 +915,7 @@
 		var grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.groupingUIID);
 		
 		evt.target.scrollContent.branchingActivity = _canvasModel.selectedItem.activity;
-		evt.target.scrollContent.groups = grouping.getGroups();
+		evt.target.scrollContent.groups = grouping.getGroups(_canvasModel.getCanvas().ddm);
 		evt.target.scrollContent.branches = getValidBranches(branches.myBranches);
 		
 		evt.target.scrollContent.loadLists();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as
===================================================================
diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r0267a9238f122504943b400c11ca0fa751698aba
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as	(.../ValidationIssue.as)	(revision d7823922f404944822957e6c051bc0f1335a76de)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as	(.../ValidationIssue.as)	(revision 0267a9238f122504943b400c11ca0fa751698aba)
@@ -15,7 +15,10 @@
 	public static var TRANSITION_ERROR_CODE:String = "T";
 	public static var ACTIVITY_TRANSITION_ERROR_CODE:String = "AT";
 	public static var INPUT_TRANSITION_ERROR_CODE:String = "IT";
-	public static var OUTPUT_TRANSITION_ERROR_CODE:String = "OT1";
+	public static var OUTPUT_TRANSITION_ERROR_CODE:String = "OT1";
+	
+	public static var GROUPING_ACTIVITY_MISSING_GROUPING_ERROR_CODE:String = "GM";
+	public static var GROUPING_ACTIVITY_GROUP_COUNT_MISMATCH_ERROR_CODE:String = "GC";
 	
 	function ValidationIssue(code:String, message:String, UIID:Number) {
 		_code = code;