Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rfc0f0136963cabbd4cad612035c80dc35c5717ff -r78cf415a0c5ed341d97bebacb5fe638133aaa313
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rfc0f0136963cabbd4cad612035c80dc35c5717ff -r78cf415a0c5ed341d97bebacb5fe638133aaa313
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
===================================================================
diff -u -r96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63 -r78cf415a0c5ed341d97bebacb5fe638133aaa313
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as	(.../Branch.as)	(revision 96b7d23e6ff1d27f5f2637fa1c1dfe471861fa63)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as	(.../Branch.as)	(revision 78cf415a0c5ed341d97bebacb5fe638133aaa313)
@@ -41,6 +41,8 @@
 	public function Branch(activityUIID:Number, _dir:Number, targetUIID:Number, hubUIID:Number, sequenceActivity:SequenceActivity, learningDesignID:Number){
 		if(_dir == BranchConnector.DIR_FROM_START)
 			super(null, hubUIID, targetUIID, learningDesignID);
+		else if(_dir == BranchConnector.DIR_SINGLE)
+			super(null, targetUIID, targetUIID, learningDesignID);
 		else
 			super(null, targetUIID, hubUIID, learningDesignID);
 		
@@ -89,5 +91,9 @@
 	public function get isEnd():Boolean {
 		return (_direction == BranchConnector.DIR_TO_END);
 	}
+	
+	public function get isActivityless():Boolean {
+		return (_direction == BranchConnector.DIR_SINGLE);
+	}
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -rfc0f0136963cabbd4cad612035c80dc35c5717ff -r78cf415a0c5ed341d97bebacb5fe638133aaa313
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision fc0f0136963cabbd4cad612035c80dc35c5717ff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 78cf415a0c5ed341d97bebacb5fe638133aaa313)
@@ -775,7 +775,7 @@
 			for(var i=0; i<classActs.length; i++){
 					
 				var classAct = classActs[i].toData();
-				//if(Activity(classActs[i]).isSequenceActivity() && getComplexActivityChildren(Activity(classActs[i]).activityUIID).length <= 0) classAct = null;
+				//if(Activity(classActs[i]).isSequenceActivity() && getComplexActivityChildren(Activity(classActs[i]).activityUIID).length <= 0 && SequenceActivity(classActs[i]).emptyDefault) classAct = null;
 				
 				if(classAct != null)
 					design.activities.push(classAct);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
===================================================================
diff -u -r987cb61034271852ea386a3e045463272cfb1fc5 -r78cf415a0c5ed341d97bebacb5fe638133aaa313
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 987cb61034271852ea386a3e045463272cfb1fc5)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as	(.../SequenceActivity.as)	(revision 78cf415a0c5ed341d97bebacb5fe638133aaa313)
@@ -37,11 +37,13 @@
 class SequenceActivity extends ComplexActivity {
 	
 	private var _empty:Boolean;
+	private var _default:Boolean;
 	
 	function SequenceActivity(activityUIID:Number){
 		super(activityUIID);
 		_activityTypeID = SEQUENCE_ACTIVITY_TYPE;
 		_empty = true;
+		_default = false;
 	}
 	
 	/**
@@ -62,6 +64,9 @@
 	 * @return  the DTO
 	 */
 	public function toData():Object{
+		if(_empty && _default)
+			return null;
+			
 		var dto:Object = super.toData();
 		dto.defaultActivityUIID = (_firstActivityUIID == null) ? Config.NUMERIC_NULL_VALUE : _firstActivityUIID;
 
@@ -87,6 +92,14 @@
 	public function get empty():Boolean{
 		return _empty;
 	}
+	
+	public function set isDefault(b:Boolean):Void {
+		_default = b;
+	}
+	
+	public function get isDefault():Boolean {
+		return _default;
+	}
 
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
===================================================================
diff -u -r44e31ab62e679f0c173f0269d7ee6d306ca6eb2c -r78cf415a0c5ed341d97bebacb5fe638133aaa313
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 44e31ab62e679f0c173f0269d7ee6d306ca6eb2c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	(.../BranchConnector.as)	(revision 78cf415a0c5ed341d97bebacb5fe638133aaa313)
@@ -32,7 +32,8 @@
 class org.lamsfoundation.lams.authoring.br.BranchConnector extends CanvasConnection {
 	
 	public static var DIR_FROM_START:Number = 0;
-	public static var DIR_TO_END:Number = 1;
+	public static var DIR_TO_END:Number = 1;
+	public static var DIR_SINGLE:Number = 2;
 	
 	private var _branch:Branch;
 
@@ -46,10 +47,14 @@
 	}
 	
 	public function init():Void{
-		_drawnLineStyle = 0xEA00FF;
+		_drawnLineStyle = 0xAFCE63; //0xEA00FF;
 		//arrow_mc.setStyle("backgroundColor", "0xEA00FF");
 		arrow_mc.setStyle("backgroundColor", "0xAFCE63");
-		draw();
+		
+		if(branch.direction == DIR_SINGLE)
+			drawActivityless();
+		else
+			draw();
 	}
 	
 	/**
@@ -74,6 +79,22 @@
 		
 		createConnection(fromAct_mc, toAct_mc, _startPoint, _endPoint, fromOTC, toOTC);
 			
+	}
+	
+	private function drawActivityless():Void {
+		var fromAct_mc = model.activeView.startHub;	
+		var toAct_mc = model.activeView.endHub;
+		
+		var fromOTC:Object = getFromOTC(fromAct_mc);
+		var toOTC:Object = getToOTC(toAct_mc);
+		
+		_startPoint = new Point(fromAct_mc._x + fromOTC.x,fromAct_mc._y + fromOTC.y);
+		_endPoint = new Point(toAct_mc._x + toOTC.x, toAct_mc._y + toOTC.y)
+		
+		Debugger.log("sp x: " + _startPoint.x + " y: " + _startPoint.y, Debugger.CRITICAL, "drawActivityless", "BranchConnector");
+		Debugger.log("ep x: " + _endPoint.x + " y: " + _endPoint.y, Debugger.CRITICAL, "drawActivityless", "BranchConnector");
+		
+		createConnection(fromAct_mc, toAct_mc, _startPoint, _endPoint, fromOTC, toOTC);
 	}
 	
 	public function get branch():Branch{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -rfc0f0136963cabbd4cad612035c80dc35c5717ff -r78cf415a0c5ed341d97bebacb5fe638133aaa313
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision fc0f0136963cabbd4cad612035c80dc35c5717ff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 78cf415a0c5ed341d97bebacb5fe638133aaa313)
@@ -514,12 +514,15 @@
 	private function drawBranch(b:Branch, cm):Boolean{
 		
 		Debugger.log("branch: " + b, Debugger.CRITICAL, "drawBranch", "CanvasBranchView");
+		Debugger.log("branch target :  " + b.targetUIID, Debugger.CRITICAL, "drawBranch", "CanvasBranchView");
+		
 		Debugger.log("sequence: " + b.sequenceActivity.activityUIID, Debugger.CRITICAL, "drawBranch", "CanvasBranchView");
 		
-		if(!isActivityOnLayer(cm.activitiesDisplayed.get(b.targetUIID), this.activityLayer)) return false;
+		if(!isActivityOnLayer(cm.activitiesDisplayed.get(b.targetUIID), this.activityLayer)) 
+			if((b.direction == BranchConnector.DIR_SINGLE && b.targetUIID == activity.activityUIID))
+				continue;
+			else return false;
 		
-		//if(!cm.isActiveView(this) && !cm.findParent(b.sequenceActivity, activity)) return false;
-		
 		var cbv = CanvasBranchView(this);
 		var cbc = getController();
 		
@@ -528,17 +531,20 @@
 		}
 		
 		if(b.direction == BranchConnector.DIR_FROM_START) b.sequenceActivity.firstActivityUIID = b.targetUIID;
+		
 		var newBranch_mc:MovieClip = branchLayer.createChildAtDepth("BranchConnector",DepthManager.kTop,{_branch:b, controller:cbc, _canvasBranchView:cbv});
 		cm.branchesDisplayed.put(b.branchUIID,newBranch_mc);
 		
 		Debugger.log('drawn a branch:'+b.branchUIID+','+newBranch_mc,Debugger.GEN,'drawBranch','CanvasView');
 		
-		if(b.direction != BranchConnector.DIR_TO_END) {
+		if(b.direction == BranchConnector.DIR_FROM_START) {
 			cm.moveActivitiesToBranchSequence(b.targetUIID, b.sequenceActivity);
 		} else {
 			b.sequenceActivity.stopAfterActivity = false;
 		}
 		
+		b.sequenceActivity.isDefault = false;
+		
 		return true;
 	}
 		
@@ -704,6 +710,7 @@
 	
 	public function set defaultSequenceActivity(a:SequenceActivity):Void{
 		_defaultSequenceActivity = a;
+		_defaultSequenceActivity.isDefault = true;
 	}
 	
 	public function get branchLayer():MovieClip {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rfc0f0136963cabbd4cad612035c80dc35c5717ff -r78cf415a0c5ed341d97bebacb5fe638133aaa313
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision fc0f0136963cabbd4cad612035c80dc35c5717ff)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 78cf415a0c5ed341d97bebacb5fe638133aaa313)
@@ -361,7 +361,7 @@
 	public function addParentToActivity(parentID, ca:Object, doRemoveParent:Boolean){
 		ca.activity.parentUIID = parentID;
 		
-		Debugger.log('ParentId of '+ca.activity.activityUIID+ 'Is : '+ca.activity.parentUIID,Debugger.GEN,'addActivityToTransition','CanvasModel');
+		Debugger.log('ParentId of '+ca.activity.activityUIID+ 'Is : '+ca.activity.parentUIID,Debugger.GEN,'addParentToActivity','CanvasModel');
 		
 		removeActivity(ca.activity.activityUIID);
 		if(doRemoveParent) removeActivity(parentID);
@@ -711,12 +711,27 @@
 		Debugger.log('Adding Activity.UIID:'+activity.activityUIID,Debugger.GEN,'addActivityToBranch','CanvasModel');
 		_connectionActivities.push(activity);
 		
-		var fromAct = _connectionActivities[0].activityUIID
-		var toAct = _connectionActivities[1].activityUIID
+		var fromAct = _connectionActivities[0].activityUIID;
+		var toAct = _connectionActivities[1].activityUIID;
 		
 		//check we have 2 valid acts to create the transition.
 		if(fromAct == toAct){
-			return new LFError("You cannot create a Branch between the same Activities","addActivityToTransition",this);
+			// create activityless branch
+			var b:Object = (activeView.fingerprint == activeView.endHub) ? createActivitylessBranch() : new LFError("Trying to create branch in wrong direction.");
+			
+			if(b instanceof LFError) {
+				return b;
+			} else if(b != null){
+				var success:Object = _cv.ddm.addBranch(Branch(b));
+			}
+			
+			//flag the model as dirty and trigger a refresh
+			_cv.stopTransitionTool();
+			
+			setDirty();
+			
+			return true;
+			
 		}
 		
 		if(_connectionActivities.length == 2){
@@ -736,7 +751,7 @@
 				
 			//add it to the DDM
 			if(b instanceof LFError) {
-				b.sequenceActivity.stopAfterActivity = false;
+				//b.sequenceActivity.stopAfterActivity = false;
 				return b;
 			} else if(b != null){
 				var success:Object = _cv.ddm.addBranch(Branch(b));
@@ -793,7 +808,7 @@
 			}
 			
 			var branch = _cv.ddm.getBranchesForActivityUIID(toAct);
-			if(branch.target != null) {
+			if(branch.target != null && branch.target.direction != BranchConnector.DIR_SINGLE) {
 				return new LFError("Can't create transition between activities in different branches", "addActivityToTransition", this);
 			}
 				
@@ -889,6 +904,7 @@
 			return new LFError("Cannot create start-branch connection to Activity in a already connected Sequence.", "createBranchStartConnector", this);
 		} else {
 			var b = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_FROM_START, toAct.activityUIID, activeView.startHub.activity.activityUIID, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID);
+			b.sequenceActivity.isDefault = false;
 			
 			createNewSequenceActivity(activeView.activity);
 			return b;
@@ -918,6 +934,16 @@
 		
 		}
 	}
+	
+	private function createActivitylessBranch():Object{
+		
+		var b = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_SINGLE, activeView.startHub.activity.activityUIID,  null, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID);
+		b.sequenceActivity.isDefault = false;
+		
+		createNewSequenceActivity(activeView.activity);
+			
+		return b;
+	}
 
 	public function moveActivitiesToBranchSequence(activityUIID:Number, sequence:SequenceActivity):Boolean {
 		// move first activity