Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rb47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96 -r75ccded90a0064358457a15705aa8605e0553867
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rb47fd6dd5c2e5a38203cb21bd1b72c7b295d1a96 -r75ccded90a0064358457a15705aa8605e0553867
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -r75bae9f675cec296dd7e79715454b0c09b593c21 -r75ccded90a0064358457a15705aa8605e0553867
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 75bae9f675cec296dd7e79715454b0c09b593c21)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 75ccded90a0064358457a15705aa8605e0553867)
@@ -55,7 +55,7 @@
 	private var _supportsRunOffline:Boolean;
 	private var _supportsOutputs:Boolean;
 	
-	private var _gradebookToolOutputName:String;
+	private var _gradebookToolOutputDefinitionName:String;
 	
 	private var _competenceMappings:Array; // competences to which this activity is mapped
 	
@@ -145,6 +145,16 @@
 			if(StringUtils.isWDDXNull(dto.extLmsId)) { _extLmsId = null }
 			else { _extLmsId = dto.extLmsId; }
 			 
+			if(StringUtils.isWDDXNull(dto.gradebookToolOutputDefinitionName)) { _gradebookToolOutputDefinitionName = null }
+			else { _gradebookToolOutputDefinitionName = dto.gradebookToolOutputDefinitionName; }
+			
+			//TODO: Have the backend send this to flash for all tool activities in the design on startup
+			if(!StringUtils.isWDDXNull(dto.toolOutputDefinitions)) {
+				for (var i=0; i<dto.toolOutputDefinitions.length; i++) {
+					addDefinition(dto.toolOutputDefinitions[i]);
+				}
+			}
+			
 			_competenceMappings = new Array();
 			if(!StringUtils.isWDDXNull(dto.competenceMappingTitles)) {
 				for (var i=0; i<dto.competenceMappingTitles.length; i++) {
@@ -175,6 +185,8 @@
 		
 		dto.extLmsId = (_extLmsId) ? _extLmsId : Config.STRING_NULL_VALUE;
 		
+		dto.gradebookToolOutputDefinitionName = (_gradebookToolOutputDefinitionName) ? _gradebookToolOutputDefinitionName : Config.STRING_NULL_VALUE;
+		
 		dto.competenceMappings = new Array();
 		if (_competenceMappings.length > 0) {
 			for (var i=0; i<_competenceMappings.length; i++) {
@@ -238,7 +250,7 @@
 		n.supportsOutputs = _supportsOutputs;
 		n.extLmsId = _extLmsId;
 		
-		n.gradebookToolOutputName = _gradebookToolOutputName;
+		n.gradebookToolOutputDefinitionName = _gradebookToolOutputDefinitionName;
 		
 		var numDefinitions:Number = definitions.length;
 		if (numDefinitions > 0) {
@@ -259,7 +271,9 @@
 	}
 	
 	public function addDefinition(dto:Object):Void {
-		_toolOutputDefinitions.put(dto.name, dto);
+		if (!_toolOutputDefinitions.containsKey(dto.name)) {
+			_toolOutputDefinitions.put(dto.name, dto);
+		}
 	}
 	
 	public function removeDefinition(key:String):Void {
@@ -539,16 +553,16 @@
 	 * @param   n the name of the tooloutput 
 	 * @return  
 	 */
-	public function set gradebookToolOutputName (n:String):Void {
-		_gradebookToolOutputName = n;
+	public function set gradebookToolOutputDefinitionName (n:String):Void {
+		_gradebookToolOutputDefinitionName = n;
 	}
 	/**
 	 * 
 	 * @usage   
 	 * @return  
 	 */
-	public function get gradebookToolOutputName ():String {
-		return _gradebookToolOutputName;
+	public function get gradebookToolOutputDefinitionName ():String {
+		return _gradebookToolOutputDefinitionName;
 	}	
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r898ec561f901223f8091a00d6891d027fbd95f9a -r75ccded90a0064358457a15705aa8605e0553867
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 898ec561f901223f8091a00d6891d027fbd95f9a)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 75ccded90a0064358457a15705aa8605e0553867)
@@ -173,10 +173,10 @@
 		endOffset_lbl.text = Dictionary.getValue('pi_end_offset');
 		
 		groupType_lbl.text = Dictionary.getValue('pi_group_type');
-		equalGroupSizes_lbl.text = "Equal group sizes";
-		//equalGroupSizes_lbl = Dictionary.getValue('pi_equal_group_sizes');
+		equalGroupSizes_lbl.text = Dictionary.getValue('pi_equal_group_sizes');
 		numGroups_lbl.text = Dictionary.getValue('pi_num_groups');
 		numLearners_lbl.text = Dictionary.getValue('pi_num_learners');
+		preview_student_groups_lbl.text = Dictionary.getValue('view_students_before_selection');
 		
 		//Properties tab
 		title_lbl.text = Dictionary.getValue('pi_lbl_title');
@@ -185,8 +185,7 @@
 		currentGrouping_lbl.text = Dictionary.getValue('pi_lbl_currentgroup');
 		defineLater_chk.label = Dictionary.getValue('pi_definelater');
 		runOffline_chk.label = Dictionary.getValue('pi_runoffline');
-				
-		gradebook_lbl.text = "Gradebook Output";
+		gradebook_lbl.text = Dictionary.getValue('gradebook_output_type');
 		//Complex Activity
 		//min_lbl.text = Dictionary.getValue('pi_min_act');
 		//max_lbl.text = Dictionary.getValue('pi_max_act');
@@ -791,9 +790,9 @@
 			
 			var toolAct:ToolActivity = ToolActivity(_canvasModel.selectedItem.activity);
 			if (evt.target.selectedIndex > 0) {
-				toolAct.gradebookToolOutputName = evt.target.selectedItem.name;
+				toolAct.gradebookToolOutputDefinitionName = evt.target.selectedItem.name;
 			} else {
-				toolAct.gradebookToolOutputName = null;
+				toolAct.gradebookToolOutputDefinitionName = null;
 			}
 		}
 	}
@@ -804,9 +803,9 @@
 			var toolAct:ToolActivity = ToolActivity(a);
 			outputToGradebook_cmb.dataProvider = (toolAct.supportsOutputs == true) ? getToolActivityOutputTypes(toolAct) : null;
 			
-			if (toolAct.gradebookToolOutputName != null) {
+			if (toolAct.gradebookToolOutputDefinitionName != null) {
 				for (var i=0; i<outputToGradebook_cmb.dataProvider.length; i++) {
-					if (outputToGradebook_cmb.dataProvider[i].name == toolAct.gradebookToolOutputName) {
+					if (outputToGradebook_cmb.dataProvider[i].name == toolAct.gradebookToolOutputDefinitionName) {
 						outputToGradebook_cmb.selectedIndex = i;
 					}
 				}