Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r7eec5c174998730130370a7a8e2c67cb3c10cee8 -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
Binary files differ
Index: lams_central/web/author2.jsp
===================================================================
diff -u -r72d667eddbe49aaf0dfebe27c0e18fd09b96036f -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
--- lams_central/web/author2.jsp	(.../author2.jsp)	(revision 72d667eddbe49aaf0dfebe27c0e18fd09b96036f)
+++ lams_central/web/author2.jsp	(.../author2.jsp)	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -26,6 +26,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/raphael/raphael.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringGeneral.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringActivity.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringProperty.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringHandler.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringMenu.js"></script>
 	<script type="text/javascript">
@@ -80,7 +81,8 @@
 			<td id="templateContainerCell">
 				<div id="templateContainer">
 					<c:forEach var="tool" items="${tools}">
-						<div toolId="${tool.toolId}" class="template">
+						<div toolId="${tool.toolId}" supportsOutputs="${tool.supportsOutputs}"
+							 class="template">
 							<c:if test="${not empty tool.iconPath}">
 								<img src="<lams:LAMSURL/>${tool.iconPath}" />
 							</c:if>
@@ -99,6 +101,7 @@
 	
 	<!-- DIALOGS CONTENTS -->
 	
+	<!-- SEQUENCE LOAD DIALOG -->
 	<div id="ldStoreDialog" class="dialogContainer">
 		<div class="dialogTitle">Open sequence</div>
 		<table>
@@ -123,6 +126,40 @@
 	</div>
 	
 	
+	<!-- GROUP TO BRANCH MATCHING DIALOG -->
+	
+	<div id="gtbDialog" class="dialogContainer">
+		<table>
+			<tr>
+				<td></td>
+				<td></td>
+				<td rowspan="2"></td>
+				<td colspan="2" class="gtbLabelCell">
+					Mappings
+				</td>
+			</tr>
+			<tr>
+				<td class="gtbLabelCell">Groups</td>
+				<td class="gtbLabelCell">Branches</td>
+				<td class="gtbLabelCell">Group</td>
+				<td class="gtbLabelCell">Branch</td>
+			</tr>
+			<tr>
+				<td id="gtbGroupsCell" class="gtbListCell"></td>
+				<td id="gtbBranchesCell" class="gtbListCell"></td>
+				<td id="gtbButtonCell">
+					<div id="gtbAddButton"
+					     onClick="javascript:PropertyLib.addGroupToBranchMapping()"></div>
+					<div id="gtbRemoveButton"
+					     onClick="javascript:PropertyLib.removeGroupToBranchMapping()"></div>
+				</td>
+				<td id="gtbMappingGroupCell" class="gtbListCell"></td>
+				<td id="gtbMappingBranchCell" class="gtbListCell"></td>
+			</tr>
+		</table>
+	</div>
+	
+	
 	<!-- PROPERTY DIALOG CONTENTS FOR DIFFERENT ACTIVITY TYPES -->
 	
 	<div id="propertiesContentTool" class="dialogContainer">
Index: lams_central/web/css/authoring.css
===================================================================
diff -u -r72d667eddbe49aaf0dfebe27c0e18fd09b96036f -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
--- lams_central/web/css/authoring.css	(.../authoring.css)	(revision 72d667eddbe49aaf0dfebe27c0e18fd09b96036f)
+++ lams_central/web/css/authoring.css	(.../authoring.css)	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -33,6 +33,10 @@
 	padding: 0 0 0 5px;
 }
 
+div.propertiesDialogContainer .dialogContainer td {
+	padding-bottom: 5px;
+}
+
 input[name="propertiesContentFieldGroupDivide"] {
 	margin-right: 10px;
 }
@@ -101,6 +105,48 @@
 }
 
 
+div#gtbDialog > table {
+	width: 100%;
+	height: 98%;
+	table-layout: fixed;
+	border-collapse: collapse;
+}
+
+div#gtbDialog td {
+	text-align: center;
+	vertical-align: top;
+}
+
+div#gtbDialog td.gtbLabelCell {
+	height: 15px;
+	font-weight: bold;
+}
+
+div#gtbDialog td.gtbListCell {
+	border: thin black solid;
+	padding: 3px;
+}
+
+div#gtbDialog td.gtbListCell .selected {
+	background-color: #5c9ccc;
+	color: white;
+}
+
+div#gtbDialog #gtbAddButton, div#gtbDialog #gtbRemoveButton {
+	width: 40%;
+	height: 25px;
+	display: block;
+	margin: auto;
+	margin-bottom: 20px;
+}
+
+div#gtbDialog td.gtbListCell div {
+	text-align: left;
+	cursor: pointer;
+}
+
+
+
 /**** Main authoring styles ****/
 
 
@@ -124,7 +170,7 @@
 	padding: 0 5px 5px 5px;
 	font-size: 11px;
 	color: #2E6E9E;
-	z-index: 1003;
+	z-index: 1100;
 }
 
 div#toolbar .split-ui-button + ul li {
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r72d667eddbe49aaf0dfebe27c0e18fd09b96036f -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 72d667eddbe49aaf0dfebe27c0e18fd09b96036f)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -18,7 +18,7 @@
 			'to'   : []
 		};
 		
-		this.loadPropertiesDialogContent = ActivityLib.loadPropertiesDialogContent.tool;
+		this.loadPropertiesDialogContent = PropertyLib.toolProperties;
 		
 		this.draw = ActivityLib.draw.tool;
 		this.draw(x, y);
@@ -45,7 +45,7 @@
 			'to'   : []
 		};
 		
-		this.loadPropertiesDialogContent = ActivityLib.loadPropertiesDialogContent.grouping;
+		this.loadPropertiesDialogContent = PropertyLib.groupingProperties;
 
 		this.draw = ActivityLib.draw.grouping;		
 		this.draw(x, y);
@@ -63,7 +63,7 @@
 			'to'   : []
 		};
 		
-		this.loadPropertiesDialogContent = ActivityLib.loadPropertiesDialogContent.gate;
+		this.loadPropertiesDialogContent = PropertyLib.gateProperties;
 
 		this.draw = ActivityLib.draw.gate;
 		this.draw(x, y);
@@ -93,7 +93,7 @@
 		}
 		this.branchingActivity = branchingActivity;
 		
-		this.loadPropertiesDialogContent = ActivityLib.loadPropertiesDialogContent.branching;
+		this.loadPropertiesDialogContent = PropertyLib.branchingProperties;
 		
 		this.draw = ActivityLib.draw.branching;
 		this.draw(x, y);
@@ -142,7 +142,7 @@
 							 .attr({
 								'fill' : this.offline ? layout.colors.offlineActivity : layout.colors.activity
 							 });
-			paper.image(layout.toolIcons[this.toolID], x + 47, y + 2, 30, 30);
+			paper.image(layout.toolMetadata[this.toolID].iconPath, x + 47, y + 2, 30, 30);
 			paper.text(x + 62, y + 40, ActivityLib.shortenActivityTitle(this.title))
 				 .attr({
 					 'fill' : this.offline ? layout.colors.offlineActivityText : layout.colors.activityText
@@ -256,281 +256,6 @@
 	
 	
 	/**
-	 * Methods initialising and refreshing properties dialog for various kinds of activities.
-	 */
-	loadPropertiesDialogContent : {
-		tool : function() {
-			var activity = this,
-				content = activity.propertiesContent;
-			if (!content) {
-				// first run, create the content
-				content = activity.propertiesContent = $('#propertiesContentTool').clone().attr('id', null)
-														.show().data('activity', activity);
-				$('.propertiesContentFieldTitle', content).val(activity.title);
-				
-				$('input, select', content).change(function(){
-					// extract changed properties and redraw the activity
-					var content = $(this).closest('.dialogContainer'),
-						activity = content.data('activity'),
-						redrawNeeded = false,
-						newTitle =  $('.propertiesContentFieldTitle', content).val();
-					if (newTitle != activity.title) {
-						activity.title = newTitle;
-						redrawNeeded = true;
-					}
-					var newGroupingValue = $('.propertiesContentFieldGrouping option:selected', content)
-										.data('grouping');
-					if (newGroupingValue != activity.grouping) {
-						activity.grouping = newGroupingValue;
-						redrawNeeded = true;
-					}
-					activity.defineInMonitor = $('.propertiesContentFieldDefineMonitor', content)
-										.is(':checked');
-					var newOfflineValue = $('.propertiesContentFieldOffline', content)
-										.is(':checked');
-					if (newOfflineValue != activity.offline) {
-						activity.offline = newOfflineValue;
-						redrawNeeded = true;
-					}
-					
-					if (redrawNeeded) {
-						activity.draw();
-					}
-				});
-			}
-			
-			ActivityLib.loadPropertiesDialogContent.fillGroupingDropdown(content, activity.grouping);
-		},
-		
-		
-		grouping : function() {
-			var activity = this,
-				content = activity.propertiesContent;
-
-			if (!content) {
-				// make onChange function a local variable, because it's used several times
-				var changeFunction = function(){
-					// extract changed properties and redraw the activity, if needed
-					var content = $(this).closest('.dialogContainer'),
-						activity = content.data('activity'),
-						redrawNeeded = false,
-						newTitle = $('.propertiesContentFieldTitle', content).val();
-					if (newTitle != activity.title) {
-						activity.title = newTitle;
-						redrawNeeded = true;
-					}
-					
-					activity.groupingType = $('.propertiesContentFieldGroupingType', content).val();
-					
-					$('input[name="propertiesContentFieldGroupDivide"]', content).each(function(){
-							// enable/disable division types, depending on radio buttons next to them
-							$(this).next().find('.spinner').spinner('option', 'disabled', !$(this).is(':checked'));
-						})
-						// hide group/learner division with some grouping types
-						.add($('.propertiesContentFieldLearnerCount', content).closest('tr'))
-						.css('display', activity.groupingType == 'monitor' ? 'none' : '');
-					
-					$('.propertiesContentFieldEqualSizes, .propertiesContentFieldViewLearners', content)
-						.closest('tr').css('display', activity.groupingType == 'learner' ? '' : 'none');
-					
-					activity.groupDivide = activity.groupingType == 'monitor' ||
-						$('.propertiesContentFieldGroupCountEnable', content).is(':checked') ?
-						'groups' : 'learners';
-					$('.propertiesContentFieldNameGroups', content).css('display',
-							activity.groupDivide == 'groups' ? '' : 'none');		
-					
-					activity.groupCount = $('.propertiesContentFieldGroupCount', content).val();
-					activity.learnerCount = $('.propertiesContentFieldLearnerCount', content).val();
-					activity.equalSizes = $('.propertiesContentFieldEqualSizes', content).is(':checked');
-					activity.viewLearners = $('.propertiesContentFieldViewLearners', content).is(':checked');
-					
-					if (redrawNeeded) {
-						activity.draw();
-					}
-				};
-				
-				// first run, create the content
-				content = activity.propertiesContent = $('#propertiesContentGrouping').clone().attr('id', null)
-														.show().data('activity', activity);
-				
-				// init widgets
-				$('.propertiesContentFieldTitle', content).val(activity.title);
-				$('.propertiesContentFieldGroupingType', content).val(activity.groupingType);
-				if (activity.groupDivide == 'learners') {
-					$('.propertiesContentFieldLearnerCountEnable', content).attr('checked', 'checked');
-				} else {
-					$('.propertiesContentFieldGroupCountEnable', content).attr('checked', 'checked');
-				}	
-				
-				// create groups/learners spinners
-				$('.propertiesContentFieldGroupCount', content).spinner({
-					'min' : 2,
-					'disabled' : activity.groupDivide == 'learners'
-				}).spinner('value', activity.groupCount)
-				  .on('spinchange', changeFunction);
-				
-				$('.propertiesContentFieldLearnerCount', content).spinner({
-					'min' 	   : 1,
-					'disabled' : activity.groupDivide == 'groups'
-				}).spinner('value', activity.learnerCount)
-				  .on('spinchange', changeFunction);
-				
-				$('.propertiesContentFieldEqualSizes', content).attr('checked', activity.equalSizes ? 'checked' : null);
-				$('.propertiesContentFieldViewLearners', content).attr('checked', activity.viewLearners ? 'checked' : null);
-				$('.propertiesContentFieldNameGroups', content).button().click(function(){
-					ActivityLib.openGroupNamingDialog(activity);
-				});
-				
-				$('input, select', content).change(changeFunction);
-				changeFunction.call(content);
-			}
-		},
-		
-		
-		gate : function() {
-			var activity = this,
-				content = activity.propertiesContent;
-			if (!content) {
-				// first run, create the content
-				content = activity.propertiesContent = $('#propertiesContentGate').clone().attr('id', null)
-														.show().data('activity', activity);
-				$('.propertiesContentFieldTitle', content).val(activity.title);
-				$('.propertiesContentFieldGateType', content).val(activity.gateType);
-
-				$('input, select', content).change(function(){
-					// extract changed properties and redraw the activity
-					var content = $(this).closest('.dialogContainer'),
-						activity = content.data('activity'),
-						redrawNeeded = false,
-						newTitle = $('.propertiesContentFieldTitle', content).val();
-					if (newTitle != activity.title) {
-						activity.title = newTitle;
-						redrawNeeded = true;
-					}
-					activity.gateType = $('.propertiesContentFieldGateType', content).val();
-					
-					if (redrawNeeded) {
-						activity.draw();
-					}
-				});
-			}
-		},
-		
-		
-		branching : function() {
-			var activity = this,
-			content = activity.propertiesContent;
-			
-			var fillWidgetsFunction = function(){
-				$('.propertiesContentFieldTitle', content).val(activity.branchingActivity.title);
-				$('.propertiesContentFieldBranchingType', content).val(activity.branchingActivity.branchingType);
-				ActivityLib.loadPropertiesDialogContent.fillGroupingDropdown(content, activity.branchingActivity.grouping);
-				ActivityLib.loadPropertiesDialogContent.fillToolInputDropdown(content, activity.branchingActivity.input);
-			}
-			
-			if (!content) {
-				// first run, create the content
-				content = activity.propertiesContent = $('#propertiesContentBranching').clone().attr('id', null)
-														.show().data('activity', activity);
-				$('.propertiesContentFieldMatchGroups', content).button();
-				
-				var changeFunction = function(){
-					// extract changed properties and redraw the activity
-					var content = $(this).closest('.dialogContainer'),
-						activity = content.data('activity'),
-						branchingActivity = activity.branchingActivity,
-						redrawNeeded = false,
-						newTitle = $('.propertiesContentFieldTitle', content).val();
-					if (newTitle != branchingActivity.title) {
-						branchingActivity.title = newTitle;
-						redrawNeeded = true;
-					}
-					branchingActivity.branchingType = $('.propertiesContentFieldBranchingType', content).val();
-					
-					var groupingRow = $('.propertiesContentFieldGrouping', content).closest('tr');
-					if (branchingActivity.branchingType == 'group') {
-						branchingActivity.grouping = groupingRow.show()
-													.find('option:selected').data('grouping');
-					} else {
-						groupingRow.hide();
-						branchingActivity.grouping = null;
-					}
-					$('.propertiesContentFieldMatchGroups', content).closest('tr')
-						.css('display', branchingActivity.grouping ? '' : 'none');
-					
-					var inputRow = $('.propertiesContentFieldInput', content).closest('tr');
-					if (branchingActivity.branchingType == 'tool') {
-						branchingActivity.input = inputRow.show()
-							.find('option:selected').data('activity');
-					} else {
-						inputRow.hide();
-						branchingActivity.input = null;
-					}
-
-					if (redrawNeeded) {
-						branchingActivity.start.draw();
-						branchingActivity.end.draw();
-					}
-				}
-				
-				$('input, select', content).change(changeFunction);
-				fillWidgetsFunction();
-				changeFunction.call(content);
-			}
-			
-			fillWidgetsFunction();
-		},
-		
-		
-		/**
-		 * 	Find all groupings on canvas and fill dropdown menu with their titles
-		 */
-		fillGroupingDropdown : function(content, grouping) {
-			// find all groupings on canvas and fill dropdown menu with their titles
-			var emptyOption = $('<option />'),
-				groupingDropdown = $('.propertiesContentFieldGrouping', content).empty().append(emptyOption);
-			$.each(layout.activities, function(){
-				if (this.type == 'grouping') {
-					var option = $('<option />').text(this.title)
-												.appendTo(groupingDropdown)
-												// store reference to grouping object
-												.data('grouping', this);
-					if (this == grouping) {
-						option.attr('selected', 'selected');
-					}
-				}
-			});
-			if (!grouping) {
-				// no grouping selected
-				emptyOption.attr('selected', 'selected');
-			}
-		},
-		
-		
-		fillToolInputDropdown : function(content, input) {
-			// find all tools that support input and fill dropdown menu with their titles
-			var emptyOption = $('<option />'),
-				inputDropdown = $('.propertiesContentFieldInput', content).empty().append(emptyOption);
-			$.each(layout.activities, function(){
-				if (this.supportsOutputs) {
-					var option = $('<option />').text(this.title)
-												.appendTo(inputDropdown)
-												// store reference to grouping object
-												.data('activity', this);
-					if (this == input) {
-						option.attr('selected', 'selected');
-					}
-				}
-			});
-			if (!input) {
-				// no grouping selected
-				emptyOption.attr('selected', 'selected');
-			}
-		}
-	},
-	
-	
-	/**
 	 * Make a new activity fully functional on canvas.
 	 */
 	activityHandlersInit : function(activity) {
@@ -975,25 +700,5 @@
 	translateEventOnCanvas : function(event) {
 		return [event.pageX + canvas.scrollLeft() - canvas.offset().left,
 		        event.pageY + canvas.scrollTop()  - canvas.offset().top];
-	},
-	
-	
-	/**
-	 * Fills group naming dialog with existing group names and opens it.
-	 */
-	openGroupNamingDialog : function(activity) {
-		var dialog = layout.items.groupNamingDialog;
-		// remove existing entries and add reference to the initiating activity
-		dialog.empty().dialog('option', 'activity', activity);
-		
-		for (var groupIndex = 1; groupIndex <= activity.groupCount; groupIndex++) {
-			// generate group names if they do not exist
-			var groupName = groupIndex > activity.groupNames.length ?
-					'Group ' + groupIndex : activity.groupNames[groupIndex - 1];
-			$('<input type="text" />').addClass('groupName').appendTo(dialog).val(groupName);
-			dialog.append('<br />');
-		}
-		
-		dialog.dialog('open');
 	}
 };
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -r72d667eddbe49aaf0dfebe27c0e18fd09b96036f -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 72d667eddbe49aaf0dfebe27c0e18fd09b96036f)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -11,15 +11,23 @@
 	'activities' : null,
 	'items' : {
 		'bin'               : null,
+		
 		'selectedActivity'  : null,
+		'copiedActivity'    : null,
+		
 		'propertiesDialog'  : null,
 		'infoDialog'        : null,
-		'copiedActivity'    : null,
-		'groupNamingDialog' : null
+		'groupNamingDialog' : null,
+		'groupsToBranchesMappingDialog' : null
 	},
-	'toolIcons': {
-		'grouping' : '../images/grouping.gif',
-		'gate'     : '../images/stop.gif'
+	
+	'toolMetadata': {
+		'grouping' : {
+			'iconPath' : '../images/grouping.gif'
+		},
+		'gate'     : {		
+			'iconPath' : '../images/stop.gif'
+		}
 	},
 	'conf' : {
 		'propertiesDialogDimOpacity'   : 0.3,
@@ -33,11 +41,11 @@
 	},
 	'defs' : {
 		'activity'      : ' h 125 v 50 h -125 z',
-		'bin'           : 'M 0 0 h -50 l 10 50 h 30 z',
+		'branchingEdgeStart' : ' a 8 8 0 1 0 16 0 a 8 8 0 1 0 -16 0',
+		'branchingEdgeEnd'   : ' a 8 8 0 1 0 16 0 a 8 8 0 1 0 -16 0',
 		'transArrow'    : ' l 10 15 a 25 25 0 0 0 -20 0 z',
 		'gate'          : ' l-8 8 v14 l8 8 h14 l8 -8 v-14 l-8 -8 z',
-		'branchingEdgeStart' : ' a 8 8 0 1 0 16 0 a 8 8 0 1 0 -16 0',
-		'branchingEdgeEnd'   : ' a 8 8 0 1 0 16 0 a 8 8 0 1 0 -16 0'
+		'bin'           : 'M 0 0 h -50 l 10 50 h 30 z'
 	},
 	'colors' : {
 		'activity'     		  : '#A9C8FD',
@@ -46,12 +54,12 @@
 		'offlineActivityText' : 'white',
 		'gate'         		  : 'red',
 		'gateText'     		  : 'white',
-		'transition'   		  : 'rgb(119,126,157)',
-		'binActive'    		  : 'red',
-		'selectEffect'        : 'blue',
 		'branchingEdgeStart'  : 'green',
 		'branchingEdgeEnd'    : 'red',
-		'branchingEdgeMatch'  : 'blue'
+		'branchingEdgeMatch'  : 'blue',
+		'transition'   		  : 'rgb(119,126,157)',
+		'binActive'    		  : 'red',
+		'selectEffect'        : 'blue'
 	},
 };
 
@@ -65,6 +73,8 @@
 	
 	initLayout();
 	initTemplates();
+	PropertyLib.init();
+	MenuLib.init();
 });
 
 
@@ -74,9 +84,12 @@
 function initTemplates(){
 	$('.template').each(function(){
 		var toolId = $(this).attr('toolId');
-		// register tool icons so they are later easily accessible
-		layout.toolIcons[toolId] = $('img', this).attr('src');
-
+		// register tool properties so they are later easily accessible
+		layout.toolMetadata[toolId] = {
+			'iconPath' : $('img', this).attr('src'),
+			'supportsOutputs' : $(this).attr('supportsOutputs')
+		};
+		
 		// if a tool's name is too long and gets broken into two lines
 		// make some adjustments to layout
 		var toolName = $('div', this);
@@ -132,68 +145,6 @@
  * Initialises various Authoring widgets.
  */
 function initLayout() {
-	// add jQuery UI button functionality
-	$('.ui-button').button();
-	$(".split-ui-button").each(function(){
-		// drop down buttons
-		var buttonContainer = $(this);
-		var buttons = buttonContainer.children();
-		
-		buttons.first().button()
-			   .next().button({
-			text : false,
-			icons : {
-				primary : "ui-icon-triangle-1-s"
-			}
-		});
-		buttonContainer.buttonset().next().hide().menu();
-		
-		buttons.each(function(){
-			var button = $(this);
-			if (!button.attr('onclick')) {
-				button.click(function() {
-					var menu = $(this).parent().next().show().position({
-						my : "left top+2px",
-						at : "left bottom",
-						of : $(this).parent()
-					});
-					$(document).one("click", function() {
-						menu.hide();
-					});
-					return false;
-				});
-			}
-		});
-	});
-	
-	
-	// initialise the properties dialog singleton
-	var propertiesDialog = layout.items.propertiesDialog =
-		$('<div />')
-			.appendTo('body')
-			.dialog({
-				'autoOpen'      : false,
-				'closeOnEscape' : false,
-				'position'      : {
-					'my' : 'left top',
-					'at' : 'left top',
-					'of' :  '#canvas'
-				},
-				'resizable'     : true,
-				'title'         : 'Properties'
-			});
-	// for proximity detection throttling (see handlers)
-	propertiesDialog.lastRun = 0;
-	// remove close button, add dimming
-	propertiesDialog.container = propertiesDialog.closest('.ui-dialog');
-	propertiesDialog.container.addClass('propertiesDialogContainer')
-							  .css('opacity', layout.conf.propertiesDialogDimOpacity)
-	 						  .mousemove(HandlerLib.approachPropertiesDialogHandler)
-	                          .find('.ui-dialog-titlebar-close').remove();
-	
-
-	
-	
 	// initalise open Learning Design dialog
 	var ldStoreDialog = $('#ldStoreDialog').dialog({
 		'autoOpen'      : false,
@@ -291,46 +242,6 @@
 					    of: '#canvas'
 				      }
 	});
-	
-	
-	// initialise dialog from group nameing
-	layout.items.groupNamingDialog = $('<div />').dialog({
-		'autoOpen' : false,
-		'modal'  : true,
-		'show'   : 'fold',
-		'hide'   : 'fold',
-		'position' : {
-			'of' :  '#canvas'
-		},
-		'title'  : 'Group Naming',
-		'buttons' : [
-		             {
-		            	'text'   : 'OK',
-		            	'click'  : function() {
-		            		var dialog = $(this),
-		            			activity = dialog.dialog('option', 'activity');
-		            		
-		            		// extract group names from text fields
-		            		activity.groupNames = [];
-		            		$('input', dialog).each(function(){
-		            			// do not take into account empty group names
-		            			var groupName = $(this).val().trim();
-		            			if (groupName) {
-		            				activity.groupNames.push(groupName);
-		            			}
-		            		});
-		            		
-		            		dialog.dialog('close');
-						}
-		             },
-		             {
-		            	'text'   : 'Cancel',
-		            	'click'  : function() {
-							$(this).dialog('close');
-						}
-		             }
-		]
-	});
 }
 
 
@@ -378,6 +289,8 @@
 										activityData.yCoord,
 										activityData.activityTitle,
 										activityData.supportsOutputs);
+						// for later reference
+						activityData.activity = activity;
 						break;
 					
 					// Grouping Activity
@@ -445,9 +358,13 @@
 							branchingEdge = new ActivityLib.BranchingEdgeActivity(activityData.activityID, 0, 0, 
 									activityData.activityTitle, branchingType, null);
 						layout.activities.push(branchingEdge);
+						// for later reference
+						activityData.activity = branchingEdge;
+						
 						branchingEdge = new ActivityLib.BranchingEdgeActivity(
 								null, 0, 0, null, null, branchingEdge.branchingActivity);
 						layout.activities.push(branchingEdge);
+
 						break;
 					
 					// Sequence Activity, i.e. a branch
@@ -472,8 +389,6 @@
 					return true;
 				}
 				layout.activities.push(activity);
-				// for later reference
-				activityData.activity = activity;
 				
 				
 				// store information about the branch the activity belongs to
@@ -522,8 +437,12 @@
 					$.each(layout.activities, function(){
 						if (this.type == 'grouping' && groupingID == this.groupingID) {
 							// add reference and redraw the grouped activity
-							groupedActivity.grouping = this;
-							groupedActivity.draw();
+							if (groupedActivity.type == 'branchingEdge') {
+								groupedActivity.branchingActivity.grouping = this;
+							} else {
+								groupedActivity.grouping = this;
+								groupedActivity.draw();
+							}
 							return false;
 						}
 					});
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r72d667eddbe49aaf0dfebe27c0e18fd09b96036f -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 72d667eddbe49aaf0dfebe27c0e18fd09b96036f)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -3,7 +3,44 @@
  */
 
 var MenuLib = {
+		
+	init : function(){
+		// add jQuery UI button functionality
+		$('.ui-button').button();
+		$(".split-ui-button").each(function(){
+			// drop down buttons
+			var buttonContainer = $(this);
+			var buttons = buttonContainer.children();
+			
+			buttons.first().button()
+				   .next().button({
+				text : false,
+				icons : {
+					primary : "ui-icon-triangle-1-s"
+				}
+			});
+			buttonContainer.buttonset().next().hide().menu();
+			
+			buttons.each(function(){
+				var button = $(this);
+				if (!button.attr('onclick')) {
+					button.click(function() {
+						var menu = $(this).parent().next().show().position({
+							my : "left top+2px",
+							at : "left bottom",
+							of : $(this).parent()
+						});
+						$(document).one("click", function() {
+							menu.hide();
+						});
+						return false;
+					});
+				}
+			});
+		});
+	},
 	
+	
 	/**
 	 * Run when branching is selected from menu. Allows placing branching and converge points on canvas.
 	 */
@@ -42,7 +79,8 @@
 	 * Run when grouping is dropped on canvas. Creates a new grouping activity.
 	 */
 	addGrouping : function() {
-		canvas.css('cursor', 'url("' + layout.toolIcons.grouping + '"), move').click(function(event){
+		canvas.css('cursor', 'url("' + layout.toolMetadata.grouping.iconPath + '"), move')
+			  .click(function(event){
 			HandlerLib.resetCanvasMode();
 			
 			// pageX and pageY tell event coordinates relative to the whole page
@@ -80,7 +118,7 @@
 	 * Run when gate is dropped on canvas. Creates a new gate activity.
 	 */
 	addGate : function() {
-		canvas.css('cursor', 'url("' + layout.toolIcons.gate + '"), move').click(function(event){
+		canvas.css('cursor', 'url("' + layout.toolMetadata.gate.iconPath + '"), move').click(function(event){
 			HandlerLib.resetCanvasMode();
 			
 			// pageX and pageY tell event coordinates relative to the whole page
Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(revision 0)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -0,0 +1,554 @@
+/**
+ * This file contains methods for Activity properties dialogs.
+ */
+var PropertyLib = {
+		
+	init : function(){
+		// initialise the properties dialog singleton
+		var propertiesDialog = layout.items.propertiesDialog =
+			$('<div />')
+				.appendTo('body')
+				.dialog({
+					'autoOpen'      : false,
+					'closeOnEscape' : false,
+					'position'      : {
+						'my' : 'left top',
+						'at' : 'left top',
+						'of' :  '#canvas'
+					},
+					'resizable'     : true,
+					'title'         : 'Properties'
+				});
+		// for proximity detection throttling (see handlers)
+		propertiesDialog.lastRun = 0;
+		// remove close button, add dimming
+		propertiesDialog.container = propertiesDialog.closest('.ui-dialog');
+		propertiesDialog.container.addClass('propertiesDialogContainer')
+								  .css('opacity', layout.conf.propertiesDialogDimOpacity)
+		 						  .mousemove(HandlerLib.approachPropertiesDialogHandler)
+		                          .find('.ui-dialog-titlebar-close').remove();
+		
+		
+		// initialise dialog from group naming
+		layout.items.groupNamingDialog = $('<div />').dialog({
+			'autoOpen' : false,
+			'modal'  : true,
+			'show'   : 'fold',
+			'hide'   : 'fold',
+			'position' : {
+				'of' :  '#canvas'
+			},
+			'title'  : 'Group Naming',
+			'buttons' : [
+			             {
+			            	'text'   : 'OK',
+			            	'click'  : function() {
+			            		var dialog = $(this),
+			            			activity = dialog.dialog('option', 'activity');
+			            		
+			            		// extract group names from text fields
+			            		activity.groupNames = [];
+			            		$('input', dialog).each(function(){
+			            			// do not take into account empty group names
+			            			var groupName = $(this).val().trim();
+			            			if (groupName) {
+			            				activity.groupNames.push(groupName);
+			            			}
+			            		});
+			            		
+			            		dialog.dialog('close');
+							}
+			             },
+			             {
+			            	'text'   : 'Cancel',
+			            	'click'  : function() {
+								$(this).dialog('close');
+							}
+			             }
+			]
+		});
+		
+		
+		// initialise dialog from matching groups to branches in branching activities
+		var gtbDialog = layout.items.groupsToBranchesMappingDialog = $('#gtbDialog').dialog({
+			'autoOpen' : false,
+			'modal'  : true,
+			'show'   : 'fold',
+			'hide'   : 'fold',
+			'position' : {
+				'of' :  '#canvas'
+			},
+			'width'  : 800,
+			'height' : 400,
+			'title'  : 'Match Groups to Branches',
+			'buttons' : [
+			             {
+			            	'text'   : 'OK',
+			            	'click'  : function() {
+			            		var dialog = $(this),
+			            			activity = dialog.dialog('option', 'activity');
+			            		
+			            		// find references to groups and branches
+			            		activity.groupsToBranches = [];
+			            		$('#gtbMappingGroupCell div', dialog).each(function(){
+			            			var groupName = $(this).text(),
+			            				branchName = $(this).data('boundItem').text(),
+			            				branch = null;
+			            			
+			            			$.each(activity.branchingActivity.branches, function(){
+			            				if (branchName == this.title) {
+			            					branch = this;
+			            					return false;
+			            				}
+			            			});
+			            			activity.groupsToBranches.push({
+			            				'group'  : groupName,
+			            				'branch' : branch
+			            			});
+			            		});
+			            		
+			            		dialog.dialog('close');
+							}
+			             },
+			             {
+			            	'text'   : 'Cancel',
+			            	'click'  : function() {
+								$(this).dialog('close');
+							}
+			             }
+			]
+		});
+		
+		$('#gtbAddButton', gtbDialog).button({
+			'icons' : {
+				'primary' :  'ui-icon-seek-next'
+			},
+			'text' : false
+		});
+		$('#gtbRemoveButton', gtbDialog).button({
+			'icons' : {
+				'primary' :  'ui-icon-seek-prev'
+			},
+			'text' : false
+		});
+	},
+	
+	
+	/**
+	 * Properties dialog content for Tool activities.
+	 */
+	toolProperties : function() {
+		var activity = this,
+			content = activity.propertiesContent;
+		if (!content) {
+			// first run, create the content
+			content = activity.propertiesContent = $('#propertiesContentTool').clone().attr('id', null)
+													.show().data('activity', activity);
+			$('.propertiesContentFieldTitle', content).val(activity.title);
+			
+			$('input, select', content).change(function(){
+				// extract changed properties and redraw the activity
+				var content = $(this).closest('.dialogContainer'),
+					activity = content.data('activity'),
+					redrawNeeded = false,
+					newTitle =  $('.propertiesContentFieldTitle', content).val();
+				if (newTitle != activity.title) {
+					activity.title = newTitle;
+					redrawNeeded = true;
+				}
+				var newGroupingValue = $('.propertiesContentFieldGrouping option:selected', content)
+									.data('grouping');
+				if (newGroupingValue != activity.grouping) {
+					activity.grouping = newGroupingValue;
+					redrawNeeded = true;
+				}
+				activity.defineInMonitor = $('.propertiesContentFieldDefineMonitor', content)
+									.is(':checked');
+				var newOfflineValue = $('.propertiesContentFieldOffline', content)
+									.is(':checked');
+				if (newOfflineValue != activity.offline) {
+					activity.offline = newOfflineValue;
+					redrawNeeded = true;
+				}
+				
+				if (redrawNeeded) {
+					activity.draw();
+				}
+			});
+		}
+		
+		PropertyLib.fillGroupingDropdown(content, activity.grouping);
+	},
+	
+	
+	/**
+	 * Properties dialog content for Grouping activities.
+	 */
+	groupingProperties : function() {
+		var activity = this,
+			content = activity.propertiesContent;
+
+		if (!content) {
+			// make onChange function a local variable, because it's used several times
+			var changeFunction = function(){
+				// extract changed properties and redraw the activity, if needed
+				var content = $(this).closest('.dialogContainer'),
+					activity = content.data('activity'),
+					redrawNeeded = false,
+					newTitle = $('.propertiesContentFieldTitle', content).val();
+				if (newTitle != activity.title) {
+					activity.title = newTitle;
+					redrawNeeded = true;
+				}
+				
+				activity.groupingType = $('.propertiesContentFieldGroupingType', content).val();
+				
+				$('input[name="propertiesContentFieldGroupDivide"]', content).each(function(){
+						// enable/disable division types, depending on radio buttons next to them
+						$(this).next().find('.spinner').spinner('option', 'disabled', !$(this).is(':checked'));
+					})
+					// hide group/learner division with some grouping types
+					.add($('.propertiesContentFieldLearnerCount', content).closest('tr'))
+					.css('display', activity.groupingType == 'monitor' ? 'none' : '');
+				
+				$('.propertiesContentFieldEqualSizes, .propertiesContentFieldViewLearners', content)
+					.closest('tr').css('display', activity.groupingType == 'learner' ? '' : 'none');
+				
+				activity.groupDivide = activity.groupingType == 'monitor' ||
+					$('.propertiesContentFieldGroupCountEnable', content).is(':checked') ?
+					'groups' : 'learners';
+				$('.propertiesContentFieldNameGroups', content).css('display',
+						activity.groupDivide == 'groups' ? '' : 'none');		
+				
+				activity.groupCount = $('.propertiesContentFieldGroupCount', content).val();
+				activity.learnerCount = $('.propertiesContentFieldLearnerCount', content).val();
+				activity.equalSizes = $('.propertiesContentFieldEqualSizes', content).is(':checked');
+				activity.viewLearners = $('.propertiesContentFieldViewLearners', content).is(':checked');
+				
+				if (redrawNeeded) {
+					activity.draw();
+				}
+			};
+			
+			// first run, create the content
+			content = activity.propertiesContent = $('#propertiesContentGrouping').clone().attr('id', null)
+													.show().data('activity', activity);
+			
+			// init widgets
+			$('.propertiesContentFieldTitle', content).val(activity.title);
+			$('.propertiesContentFieldGroupingType', content).val(activity.groupingType);
+			if (activity.groupDivide == 'learners') {
+				$('.propertiesContentFieldLearnerCountEnable', content).attr('checked', 'checked');
+			} else {
+				$('.propertiesContentFieldGroupCountEnable', content).attr('checked', 'checked');
+			}	
+			
+			// create groups/learners spinners
+			$('.propertiesContentFieldGroupCount', content).spinner({
+				'min' : 2,
+				'disabled' : activity.groupDivide == 'learners'
+			}).spinner('value', activity.groupCount)
+			  .on('spinchange', changeFunction);
+			
+			$('.propertiesContentFieldLearnerCount', content).spinner({
+				'min' 	   : 1,
+				'disabled' : activity.groupDivide == 'groups'
+			}).spinner('value', activity.learnerCount)
+			  .on('spinchange', changeFunction);
+			
+			$('.propertiesContentFieldEqualSizes', content).attr('checked', activity.equalSizes ? 'checked' : null);
+			$('.propertiesContentFieldViewLearners', content).attr('checked', activity.viewLearners ? 'checked' : null);
+			$('.propertiesContentFieldNameGroups', content).button().click(function(){
+				PropertyLib.openGroupNamingDialog(activity);
+			});
+			
+			$('input, select', content).change(changeFunction);
+			changeFunction.call(content);
+		}
+	},
+	
+	
+	/**
+	 * Properties dialog content for Gates.
+	 */
+	gateProperties : function() {
+		var activity = this,
+			content = activity.propertiesContent;
+		if (!content) {
+			// first run, create the content
+			content = activity.propertiesContent = $('#propertiesContentGate').clone().attr('id', null)
+													.show().data('activity', activity);
+			$('.propertiesContentFieldTitle', content).val(activity.title);
+			$('.propertiesContentFieldGateType', content).val(activity.gateType);
+
+			$('input, select', content).change(function(){
+				// extract changed properties and redraw the activity
+				var content = $(this).closest('.dialogContainer'),
+					activity = content.data('activity'),
+					redrawNeeded = false,
+					newTitle = $('.propertiesContentFieldTitle', content).val();
+				if (newTitle != activity.title) {
+					activity.title = newTitle;
+					redrawNeeded = true;
+				}
+				activity.gateType = $('.propertiesContentFieldGateType', content).val();
+				
+				if (redrawNeeded) {
+					activity.draw();
+				}
+			});
+		}
+	},
+	
+	
+	/**
+	 * Properties dialog content for Branching activities.
+	 */
+	branchingProperties : function() {
+		var activity = this,
+		content = activity.propertiesContent;
+		
+		var fillWidgetsFunction = function(){
+			$('.propertiesContentFieldTitle', content).val(activity.branchingActivity.title);
+			$('.propertiesContentFieldBranchingType', content).val(activity.branchingActivity.branchingType);
+			PropertyLib.fillGroupingDropdown(content, activity.branchingActivity.grouping);
+			PropertyLib.fillToolInputDropdown(content, activity.branchingActivity.input);
+		}
+		
+		if (!content) {
+			// first run, create the content
+			content = activity.propertiesContent = $('#propertiesContentBranching').clone().attr('id', null)
+													.show().data('activity', activity);
+			$('.propertiesContentFieldMatchGroups', content).button().click(function(){
+				PropertyLib.openGroupsToBranchesMappingDialog(activity);
+			});
+			
+			var changeFunction = function(){
+				// extract changed properties and redraw the activity
+				var content = $(this).closest('.dialogContainer'),
+					activity = content.data('activity'),
+					branchingActivity = activity.branchingActivity,
+					redrawNeeded = false,
+					newTitle = $('.propertiesContentFieldTitle', content).val();
+				if (newTitle != branchingActivity.title) {
+					branchingActivity.title = newTitle;
+					redrawNeeded = true;
+				}
+				branchingActivity.branchingType = $('.propertiesContentFieldBranchingType', content).val();
+				
+				var groupingRow = $('.propertiesContentFieldGrouping', content).closest('tr');
+				if (branchingActivity.branchingType == 'group') {
+					branchingActivity.grouping = groupingRow.show()
+												.find('option:selected').data('grouping');
+				} else {
+					groupingRow.hide();
+					branchingActivity.grouping = null;
+				}
+				$('.propertiesContentFieldMatchGroups', content).closest('tr')
+					.css('display', branchingActivity.grouping ? '' : 'none');
+				
+				var inputRow = $('.propertiesContentFieldInput', content).closest('tr');
+				if (branchingActivity.branchingType == 'tool') {
+					branchingActivity.input = inputRow.show()
+						.find('option:selected').data('activity');
+				} else {
+					inputRow.hide();
+					branchingActivity.input = null;
+				}
+
+				if (redrawNeeded) {
+					branchingActivity.start.draw();
+					branchingActivity.end.draw();
+				}
+			}
+			
+			$('input, select', content).change(changeFunction);
+			fillWidgetsFunction();
+			changeFunction.call(content);
+		}
+		
+		fillWidgetsFunction();
+	},
+	
+	
+	/**
+	 * 	Find all groupings on canvas and fill dropdown menu with their titles
+	 */
+	fillGroupingDropdown : function(content, grouping) {
+		// find all groupings on canvas and fill dropdown menu with their titles
+		var emptyOption = $('<option />'),
+			groupingDropdown = $('.propertiesContentFieldGrouping', content).empty().append(emptyOption);
+		$.each(layout.activities, function(){
+			if (this.type == 'grouping') {
+				var option = $('<option />').text(this.title)
+											.appendTo(groupingDropdown)
+											// store reference to grouping object
+											.data('grouping', this);
+				if (this == grouping) {
+					option.attr('selected', 'selected');
+				}
+			}
+		});
+		if (!grouping) {
+			// no grouping selected
+			emptyOption.attr('selected', 'selected');
+		}
+	},
+	
+	
+	/**
+	 * 	Find all activities that support outputs and fill dropdown menu with their titles
+	 */
+	fillToolInputDropdown : function(content, input) {
+		// find all tools that support input and fill dropdown menu with their titles
+		var emptyOption = $('<option />'),
+			inputDropdown = $('.propertiesContentFieldInput', content).empty().append(emptyOption);
+		$.each(layout.activities, function(){
+			if (this.type == 'tool' && layout.toolMetadata[this.toolID].supportsOutputs) {
+				var option = $('<option />').text(this.title)
+											.appendTo(inputDropdown)
+											// store reference to grouping object
+											.data('activity', this);
+				if (this == input) {
+					option.attr('selected', 'selected');
+				}
+			}
+		});
+		if (!input) {
+			// no grouping selected
+			emptyOption.attr('selected', 'selected');
+		}
+	},
+	
+	
+	/**
+	 * Fills group naming dialog with existing group names and opens it.
+	 */
+	openGroupNamingDialog : function(activity) {
+		var dialog = layout.items.groupNamingDialog;
+		// remove existing entries and add reference to the initiating activity
+		dialog.empty().dialog('option', 'activity', activity);
+		
+		activity.groupNames = PropertyLib.createNameList(activity.groupCount,
+				activity.groupNames, 'Group ');
+		$.each(activity.groupNames, function(){
+			$('<input type="text" />').addClass('groupName').appendTo(dialog).val(this);
+			dialog.append('<br />');
+		});
+		
+		dialog.dialog('open');
+	},
+	
+	
+	/**
+	 * Opens dialog for assigned groups to branches in branching activity.
+	 */
+	openGroupsToBranchesMappingDialog : function(activity) {
+		var dialog = layout.items.groupsToBranchesMappingDialog,
+			branchingActivity = activity.branchingActivity,
+			grouping = branchingActivity.grouping,
+			groupsCell = $('#gtbGroupsCell', dialog),
+			branchesCell = $('#gtbBranchesCell', dialog),
+			branchNames = [];
+		// remove existing entries and add reference to the initiating activity
+		dialog.dialog('option', 'activity', activity);
+		$('.gtbListCell', dialog).empty();
+		
+		// find group names and create DOM elements out of them
+		grouping.groupNames = PropertyLib.createNameList(grouping.groupCount,
+				grouping.groupNames, 'Group ');
+		$.each(grouping.groupNames, function(){
+			$('<div />').click(PropertyLib.selectGroupsToBranchesListItem).appendTo(groupsCell)
+						.text(this);
+		});
+		
+		// find branch names and create DOM elements out of them
+		$.each(branchingActivity.branches, function(){
+			branchNames.push(this.title);
+		});
+		branchNames = PropertyLib.createNameList(branchNames.length,
+				branchNames, 'Branch ');
+		$.each(branchNames, function(){
+			$('<div />').click(PropertyLib.selectGroupsToBranchesListItem).appendTo(branchesCell)
+						.text(this);
+		});
+		
+		dialog.dialog('open');
+	},
+	
+	
+	/**
+	 * Selects a list item and optionally the matched pair.
+	 */
+	selectGroupsToBranchesListItem : function(){
+		var item = $(this),
+			boundItem = item.data('boundItem');
+		
+		item.siblings().removeClass('selected');
+		item.addClass('selected');
+		
+		if (boundItem) {
+			boundItem.siblings().removeClass('selected');
+			boundItem.addClass('selected');
+		}
+	},
+	
+	
+	/**
+	 * Creates group and branch names, if they are not already provided.
+	 */
+	createNameList : function(size, existingList, prefix) {
+		var list = [];
+		for (var itemIndex = 1; itemIndex <= size; itemIndex++) {
+			// generate a name if it does not exist
+			list.push(itemIndex > existingList.length || !existingList[itemIndex - 1] ?
+					prefix + itemIndex : existingList[itemIndex - 1]);
+		}
+		return list;
+	},
+	
+	
+	/**
+	 * Make a pair out of selected group and branch.
+	 */
+	addGroupToBranchMapping : function(){
+		var dialog = layout.items.groupsToBranchesMappingDialog,
+			selectedGroup = $('#gtbGroupsCell .selected', dialog),
+			selectedBranch =  $('#gtbBranchesCell .selected', dialog);
+		
+		if (selectedGroup.length != 1 || selectedBranch.length != 1) {
+			return;
+		}
+		
+		// original branch stays in its list
+		selectedBranch = selectedBranch.clone().click(PropertyLib.selectGroupsToBranchesListItem);
+		// add info about the pair for later reference
+		selectedGroup.data('boundItem', selectedBranch);
+		selectedBranch.data('boundItem', selectedGroup);
+		var groupCell = $('#gtbMappingGroupCell', dialog),
+			branchCell = $('#gtbMappingBranchCell', dialog);
+		// clear existing selection
+		$('.selected', groupCell).removeClass('selected');
+		$('.selected', branchCell).removeClass('selected');
+		groupCell.append(selectedGroup);
+		branchCell.append(selectedBranch);
+	},
+	
+	
+	/**
+	 * Remove a mapping of group and branch.
+	 */
+	removeGroupToBranchMapping : function() {
+		var dialog = layout.items.groupsToBranchesMappingDialog,
+			selectedGroup = $('#gtbMappingGroupCell .selected', dialog),
+			selectedBranch =  $('#gtbMappingBranchCell .selected', dialog);
+	
+		if (selectedGroup.length != 1 || selectedBranch.length != 1) {
+			return;
+		}
+		
+		selectedGroup.removeData('boundItem');
+		selectedBranch.remove();
+		$('#gtbGroupsCell', dialog).append(selectedGroup);
+	}
+};
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
===================================================================
diff -u -rb78ac844426c4d69e6104349bdf7cae2ecc6644d -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision b78ac844426c4d69e6104349bdf7cae2ecc6644d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(.../LearningDesignService.java)	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -229,6 +229,8 @@
 		    iconPath = iconPath.substring(0, iconPath.lastIndexOf('/') + 1);
 		    iconPath += "icon_" + tool.getToolIdentifier() + ".svg";
 		    toolDTO.setIconPath(iconPath);
+		    
+		    toolDTO.setSupportsOutputs(tool.getSupportsOutputs());
 		}
 		
 		tools.add(toolDTO);
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java
===================================================================
diff -u -rb78ac844426c4d69e6104349bdf7cae2ecc6644d -re1f6c04ba5b6d797d9687b375fb062fa10d754b0
--- lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java	(.../ToolDTO.java)	(revision b78ac844426c4d69e6104349bdf7cae2ecc6644d)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java	(.../ToolDTO.java)	(revision e1f6c04ba5b6d797d9687b375fb062fa10d754b0)
@@ -28,6 +28,7 @@
     private Long toolId;
     private String toolDisplayName;
     private String iconPath;
+    private Boolean supportsOutputs;
 
     public ToolDTO() {
     }
@@ -55,4 +56,12 @@
     public void setIconPath(String iconPath) {
 	this.iconPath = iconPath;
     }
+
+    public Boolean getSupportsOutputs() {
+        return supportsOutputs;
+    }
+
+    public void setSupportsOutputs(Boolean supportsOutputs) {
+        this.supportsOutputs = supportsOutputs;
+    }
 }
\ No newline at end of file