Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r54ed68f620a8d107f3aff2d634dc43f37d76f429 -r6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r54ed68f620a8d107f3aff2d634dc43f37d76f429 -r6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r54ed68f620a8d107f3aff2d634dc43f37d76f429 -r6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 54ed68f620a8d107f3aff2d634dc43f37d76f429)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce)
@@ -308,6 +308,8 @@
 			}
 		}
 
+		_condition_item_dgd.sortItemsBy("orderID", Array.NUMERIC);
+
 		itemChanged(null);
 		
 		this._visible = true;
@@ -398,20 +400,20 @@
 		switch(condition.type) {
 			case ToolOutputDefinition.LONG :
 				if(condition.startValue != null && condition.endValue != null)
-					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value", [String(condition.startValue), String(condition.endValue)]), data: condition});
+					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value", [String(condition.startValue), String(condition.endValue)]), data: condition, orderID: condition.orderID});
 				else if(condition.startValue != null && condition.endValue == null)
-					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_max", [String(condition.startValue)]), data: condition});
+					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_max", [String(condition.startValue)]), data: condition, orderID: condition.orderID});
 				else if(condition.startValue == null && condition.endValue != null)
-					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_min", [String(condition.endValue)]), data: condition});
+					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_min", [String(condition.endValue)]), data: condition, orderID: condition.orderID});
 				else
-					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_exact", [String(condition.exactMatchValue)]), data: condition});
+					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: Dictionary.getValue("branch_mapping_dlg_condition_col_value_exact", [String(condition.exactMatchValue)]), data: condition, orderID: condition.orderID});
 				
 				break;
 			case ToolOutputDefinition.BOOL: 
-				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition});
+				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID});
 				break;
 			case ToolOutputDefinition.USER_DEFINED:
-				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition});
+				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition, orderID: condition.orderID});
 				break;
 			default: 
 				Debugger.log("No type found", Debugger.GEN, "addCondition", "ToolOutputConditionsDialog");
@@ -654,6 +656,8 @@
 	private function addDefaultConditions(defaultConditions:Array):Void {
 		var ddm = app.getCanvas().ddm;
 		
+		defaultConditions.sortOn("orderID", Array.NUMERIC);
+		
 		if(_condition_item_dgd.dataProvider.length <= 0) {
 			for(var i=0; i<defaultConditions.length; i++) {
 				var condition:ToolOutputCondition = defaultConditions[i];