Index: lams_flex/LamsAuthor/.actionScriptProperties
===================================================================
diff -u -rb18306871e780d0266af4b3135c37780f09d2b72 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/.actionScriptProperties	(.../.actionScriptProperties)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
+++ lams_flex/LamsAuthor/.actionScriptProperties	(.../.actionScriptProperties)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <actionScriptProperties mainApplicationPath="LamsAuthor.mxml" version="3">
-<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" flexSDK="Flex 3.5" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.124" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" flexSDK="Flex 3.5" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="false" htmlPlayerVersion="10.0.32" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
 <compilerSourcePath/>
 <libraryPath defaultLinkType="1">
-<libraryPathEntry kind="4" path="">
-<modifiedEntries>
-<libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="true">
-<crossDomainRsls>
-<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swz"/>
-<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swf"/>
-</crossDomainRsls>
-</libraryPathEntry>
-</modifiedEntries>
-</libraryPathEntry>
+<libraryPathEntry kind="4" path=""/>
 <libraryPathEntry kind="1" linkType="1" path="libs"/>
 <libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/libs/Mate_08_7.swc" useDefaultLinkType="false"/>
 <libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/bin/LamsFlexCommon.swc" useDefaultLinkType="false"/>
Index: lams_flex/LamsAuthor/src/assets/test/default/sampleToolOutputDefinition.xml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/assets/test/default/sampleToolOutputDefinition.xml	(revision 0)
+++ lams_flex/LamsAuthor/src/assets/test/default/sampleToolOutputDefinition.xml	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -0,0 +1,86 @@
+<wddxPacket version='1.0'>
+	<header />
+	<data>
+		<struct
+			type='Lorg.lamsfoundation.lams.util.wddx.FlashMessage;'>
+			<var name='messageKey'>
+				<string>getToolOutputDefinitions</string>
+			</var>
+			<var name='messageType'>
+				<number>3.0</number>
+			</var>
+			<var name='messageValue'>
+				<array length='3'>
+					<struct
+						type='Lorg.lamsfoundation.lams.tool.dto.ToolOutputDefinitionDTO;'>
+						<var name='description'>
+							<string>
+								Number of attempts made by user
+							</string>
+						</var>
+						<var name='isDefaultGradebookMark'>
+							<boolean value='false' />
+						</var>
+						<var name='name'>
+							<string>learner.number.of.attempts</string>
+						</var>
+						<var name='showConditionNameOnly'>
+							<boolean value='false' />
+						</var>
+						<var name='startValue'>
+							<string>0</string>
+						</var>
+						<var name='type'>
+							<string>OUTPUT_LONG</string>
+						</var>
+					</struct>
+					<struct
+						type='Lorg.lamsfoundation.lams.tool.dto.ToolOutputDefinitionDTO;'>
+						<var name='description'>
+							<string>Time taken</string>
+						</var>
+						<var name='isDefaultGradebookMark'>
+							<boolean value='false' />
+						</var>
+						<var name='name'>
+							<string>learner.time.taken</string>
+						</var>
+						<var name='showConditionNameOnly'>
+							<boolean value='false' />
+						</var>
+						<var name='startValue'>
+							<string>0</string>
+						</var>
+						<var name='type'>
+							<string>OUTPUT_LONG</string>
+						</var>
+					</struct>
+					<struct
+						type='Lorg.lamsfoundation.lams.tool.dto.ToolOutputDefinitionDTO;'>
+						<var name='description'>
+							<string>User's total score</string>
+						</var>
+						<var name='endValue'>
+							<string>0</string>
+						</var>
+						<var name='isDefaultGradebookMark'>
+							<boolean value='true' />
+						</var>
+						<var name='name'>
+							<string>learner.total.score</string>
+						</var>
+						<var name='showConditionNameOnly'>
+							<boolean value='false' />
+						</var>
+						<var name='startValue'>
+							<string>0</string>
+						</var>
+						<var name='type'>
+							<string>OUTPUT_LONG</string>
+						</var>
+					</struct>
+				</array>
+			</var>
+		</struct>
+	</data>
+</wddxPacket>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/Bin.mxml
===================================================================
diff -u -rbbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/Bin.mxml	(.../Bin.mxml)	(revision bbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/Bin.mxml	(.../Bin.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -7,6 +7,7 @@
 
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.events.TransitionEvent;
 			import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
 			import org.lamsfoundation.lams.author.events.AuthorEvent;
@@ -27,7 +28,7 @@
 			private var binOver:Class;
 			
 			private function dragEnter(event:DragEvent):void {
-				if (event.dragSource.hasFormat("img"))
+				if (event.dragSource.hasFormat("img") || event.dragSource.hasFormat("dragActivity"))
                 {
                     DragManager.acceptDragDrop(Canvas(event.currentTarget));
                     image.source = binOver;
@@ -40,17 +41,10 @@
 			
 			private function dragDrop(event:DragEvent):void {
 				image.source = bin;
-				
 				if (event.dragInitiator is ActivityComponent) {
-            		var activityComponent:ActivityComponent = event.dragInitiator as ActivityComponent;
-					var activityEvent:AuthorActivityEvent = new AuthorActivityEvent(AuthorActivityEvent.DELETE_ACTIVITY_EVENT);
-					activityEvent.activityComponent = activityComponent;
-					Application.application.dispatchEvent(activityEvent);
+					AuthorController.instance.deleteActivity(event.dragInitiator as ActivityComponent);
 				} else if (event.dragInitiator is TransitionComponent) {
-					var transitionComponent:TransitionComponent = event.dragInitiator as TransitionComponent;
-					var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.DELETE_TRANSITION);
-					transitionEvent.transition = transitionComponent;
-					Application.application.dispatchEvent(transitionEvent);
+					AuthorController.instance.deleteTransition(event.dragInitiator as TransitionComponent);
 				}
 			}
 		]]>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -rfa44eb30e5b2d91538b2915a3b3dcfc6b039dae3 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision fa44eb30e5b2d91538b2915a3b3dcfc6b039dae3)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -12,6 +12,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.events.DropActivityEvent;
 			import mx.containers.Canvas;
 			import org.lamsfoundation.lams.author.util.Constants;
@@ -35,7 +36,7 @@
             // The dragEnter event handler for the Canvas container
             // enables dropping.
             private function dragEnterHandler(event:DragEvent):void {
-                if (event.dragSource.hasFormat("img"))
+                if (event.dragSource.hasFormat("dragActivity"))
                 {
                     DragManager.acceptDragDrop(Canvas(event.currentTarget));
                 }
@@ -45,8 +46,7 @@
             // sets the Image control's position by 
             // "dropping" it in its new location.
             private function dragDropHandler(event:DragEvent):void {
-                var dropActivityEvent:DropActivityEvent = new DropActivityEvent(DropActivityEvent.DROP_ACTIVITY_EVENT, event);
-                Application.application.dispatchEvent(dropActivityEvent);    
+                AuthorController.instance.dropActivity(event);  
             }
 			
 			public function doZoom(isOut:Boolean):void
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml
===================================================================
diff -u -rd75a56dbb3bbbceaeba8a0f5367d60ac305239aa -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml	(.../LearningLibrary.mxml)	(revision d75a56dbb3bbbceaeba8a0f5367d60ac305239aa)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibrary.mxml	(.../LearningLibrary.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -13,6 +13,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import mx.core.Application;
 			import mx.controls.Label;
 			import mx.containers.HBox;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml	(.../LearningLibraryEntryComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -49,15 +49,15 @@
 	        		combinedAactivityComponent.load(0);
 					combinedAactivityComponent.x = UIComponent(event.currentTarget).mouseX;
           			combinedAactivityComponent.y = UIComponent(event.currentTarget).mouseY; 
-          			ds.addData(combinedAactivityComponent, "img"); 
+          			ds.addData(combinedAactivityComponent, "dragActivity"); 
 	            	DragManager.doDrag(dragInitiator, ds, event, combinedAactivityComponent, 25, 15, 1.00, false);   
 	        	} else {
 	        		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
 	        		toolActivityComponent.tool = dragInitiator.learningLibraryEntry.toolTemplates[0];
 	        		toolActivityComponent.load(0);
 					toolActivityComponent.x = UIComponent(event.currentTarget).mouseX;
           			toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
-          			ds.addData(toolActivityComponent, "img"); 
+          			ds.addData(toolActivityComponent, "dragActivity"); 
 	            	DragManager.doDrag(dragInitiator, ds, event, toolActivityComponent, 25, 15, 1.00, false);   
 	        	}
 	        }
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml
===================================================================
diff -u -r3fb93ca162c53177b3ddfdf836c47bf868e144ff -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml	(.../LearningLibraryEntryComponent2.mxml)	(revision 3fb93ca162c53177b3ddfdf836c47bf868e144ff)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent2.mxml	(.../LearningLibraryEntryComponent2.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -89,15 +89,15 @@
 		        		combinedAactivityComponent.load();
 						combinedAactivityComponent.x = UIComponent(event.currentTarget).mouseX;
 	          			combinedAactivityComponent.y = UIComponent(event.currentTarget).mouseY; 
-	          			ds.addData(combinedAactivityComponent, "img"); 
+	          			ds.addData(combinedAactivityComponent, "dragActivity"); 
 		            	DragManager.doDrag(dragInitiator, ds, event, combinedAactivityComponent, 25, 15, 1.00, false);   
 		        	} else {
 		        		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
 		        		toolActivityComponent.tool = dragInitiator.learningLibraryEntry.toolTemplates[0];
 		        		toolActivityComponent.load();
 						toolActivityComponent.x = UIComponent(event.currentTarget).mouseX;
 	          			toolActivityComponent.y = UIComponent(event.currentTarget).mouseY;
-	          			ds.addData(toolActivityComponent, "img"); 
+	          			ds.addData(toolActivityComponent, "dragActivity"); 
 		            	DragManager.doDrag(dragInitiator, ds, event, toolActivityComponent, 25, 15, 1.00, false);   
 		        	}
 	        	}
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -17,6 +17,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.model.ToolOutputDefinition;
 			import mx.events.ListEvent;
 			import org.lamsfoundation.lams.author.components.activity.group.LearnerGroupActivityComponent;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml"
-	mouseMove="mouseMove(event)"
 	mouseDown="mouseDown(event)"
 	mouseOver="mouseOver(event)" 
 	mouseOut="mouseOut(event)"
@@ -14,6 +13,9 @@
 
 	<mx:Script>
 		<![CDATA[
+			import mx.controls.Image;
+			import org.lamsfoundation.lams.author.util.AuthorUtil;
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
 			import mx.collections.ArrayCollection;
 			import mx.core.UIComponent;
@@ -99,61 +101,71 @@
 		    	}
 		    }
 		    
-			// The mouseMove event handler for the Image control
-		    // initiates the drag-and-drop operation.
-		    protected function mouseMove(event:MouseEvent):void 
-		    {                
-		        switch (Application.application.cursorState) {
-		        	case Constants.CURSOR_STATE_NORMAL:
-		        		
-		        		var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
-				        
-				        if (activityComponent.isDragable) {
-				        	var ds:DragSource = new DragSource();
-				        	ds.addData(activityComponent, "img"); 
-				        	
-				        	// Set the offset for dropping the activity to the local mouse position
-				        	activityComponent.mouseOffSetX = event.localX;
-				        	activityComponent.mouseOffSetY = event.localY; 
-				        	     
-				        	DragManager.doDrag(activityComponent, ds, event);
-				        	setCenter();
-				        } 
-				        break;
-		        }
-		    }
 
+			/**
+			 * The mouse down event handler
+			 * Initiates drag of activity as well as starting a transition 
+			 * depending on the cursor state
+			 */
 		    protected function mouseDown(event:MouseEvent):void {
+		    	setCenter();
 		    	
 		    	switch (Application.application.cursorState) {
 		    		case Constants.CURSOR_STATE_TRANSITION:
 			    		if (this.canStartTransitions) {
 			    			startTransition(event);
 			    		}
-			    		
-		    			break;	
+		    			break;
+		    		case Constants.CURSOR_STATE_NORMAL:
+		        		startDragging(event);
+				        break;	
 		    	}
-		    	
 		    }
 		    
+		    /**
+		    * Starts dragging the ActivityComponent
+		    * 
+		    */ 
+		    public function startDragging(event:MouseEvent):void {
+				var activityComponent:ActivityComponent = event.currentTarget as ActivityComponent;
+					        
+		        if (activityComponent.isDragable) {
+		        	var ds:DragSource = new DragSource();
+		        	//ds.addData(activityComponent, "img"); 
+		        	ds.addData( activityComponent.parent, 'dragParent' );
+					ds.addData( activityComponent, 'dragActivity' );
+					
+	                 
+		        	// Set the offset for dropping the activity to the local mouse position
+		        	activityComponent.mouseOffSetX = event.localX;
+		        	activityComponent.mouseOffSetY = event.localY; 
+		        	     
+		        	DragManager.doDrag(activityComponent, ds, event, AuthorUtil.getImage(activityComponent));
+		        } 
+			}
+		    
 		    public function setCenter():void {
 		    	centerX = x + height/2;
 				centerY = y + height/2 -10;
 		    }
 		    
 	        protected function startTransition(event:MouseEvent):void {
 			 
+				// Check if there is a pre-existing transition
+				var possibleBranch:Boolean = transitionOut != null;
+				var possibleFirstActivityInBranch:ActivityComponent = null;
+				if (possibleBranch) {
+					possibleFirstActivityInBranch = transitionOut.toActivity;
+				}
+				
 				if (transitionOut != null) {
-					//parent.removeChild(transitionOut);
-					Alert.show(Application.application.dictionary.getLabelAndInsert("cv_invalid_trans_target_from_activity", [this.title.text]));
+					//Alert.show(Application.application.dictionary.getLabelAndInsert("cv_invalid_trans_target_from_activity", [this.title.text]));
 					
 					// Return cursor state to normal
-	    			Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);			
-	    			return;	
-				}
+	    			//Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);			
+	    			//return;	
+				} 
 				
-				setCenter();
-				
 				state = Constants.ACTIVITY_STATE_DRAWING;
 
 				Application.application.uiState = Constants.UI_STATE_DRAWING;
@@ -164,7 +176,10 @@
 				transitionOut.endX = centerX;
 				transitionOut.endY = centerY;
 				transitionOut.invalidateProperties();
+				transitionOut.possibleBranch = possibleBranch;
+				transitionOut.possibleFirstActivityInBranch = possibleFirstActivityInBranch;
 				
+				
 				// deselect the currently selected activity
 				if (Application.application.selectedActivity != null) {
 					Application.application.selectedActivity.deSelectActivity();
@@ -209,9 +224,11 @@
 		    	stopTransition();
 		    	
 		    	var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_COMPLETE);
-	    		transitionEvent.sourceAcivityComponent = this;
+	    		transitionEvent.sourceActivityComponent = this;
 	    		transitionEvent.transition = transitionOut;
 	    		Application.application.dispatchEvent(transitionEvent);
+	    		
+	    		AuthorController.instance.drawTransition(this, transitionOut);
 		    	
 		    }
 		    
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/BranchPoint.mxml
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/BranchPoint.mxml	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/BranchPoint.mxml	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ActivityComponent xmlns:mx="http://www.adobe.com/2006/mxml"
+	xmlns="org.lamsfoundation.lams.author.components.activity.*" 
+	verticalAlign="middle" horizontalAlign="center" horizontalScrollPolicy="off" 
+	paddingTop="3" paddingLeft="3" paddingRight="3" paddingBottom="3" height="30" width="30">
+	
+	<mx:Script>
+		<![CDATA[
+			
+			override public function setCenter():void {
+		    	centerX = x + height/2;
+				centerY = y + height/2;
+		    }
+		]]>
+	</mx:Script>
+	
+	
+	
+	
+	<mx:VBox height="100%" width="100%"
+		verticalAlign="middle" horizontalAlign="center"
+		borderStyle="solid" dropShadowEnabled="true" shadowDirection="right"
+		cornerRadius="10" backgroundColor="#C2D5FE"
+		>
+		
+	</mx:VBox>
+	
+</ActivityComponent>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -7,6 +7,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.util.Constants;
 			import mx.core.Application;
 			import mx.managers.DragManager;
@@ -22,7 +23,7 @@
 			// The dragEnter event handler for the Canvas container
             // enables dropping.
             private function dragEnterHandler(event:DragEvent):void {
-                if (event.dragSource.hasFormat("img"))
+                if (event.dragSource.hasFormat("dragActivity"))
                 {
                     DragManager.acceptDragDrop(VBox(event.currentTarget));
                 }
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(.../GroupActivityComponent.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(.../GroupActivityComponent.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -5,6 +5,7 @@
 	>
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import mx.collections.ArrayCollection;
 			import mx.controls.Label;
 			import mx.core.Application;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml
===================================================================
diff -u -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(.../NameGroupsWindow.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(.../NameGroupsWindow.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -9,6 +9,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import mx.events.ListEventReason;
 			import mx.controls.TextInput;
 			import mx.events.ListEvent;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml
===================================================================
diff -u -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -10,6 +10,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.components.activity.group.LearnerGroupActivityComponent;
 			import org.lamsfoundation.lams.author.components.activity.group.MonitorGroupActivityComponent;
 			import org.lamsfoundation.lams.author.components.activity.group.RandomGroupActivityComponent;
@@ -83,9 +84,8 @@
 	          			break;
 	        	}
 	        	
-	        	ds.addData(activityComponent, "img");  
+	        	ds.addData(activityComponent, "dragActivity");  
 	          	DragManager.doDrag(dragInitiator, ds, event, activityComponent, 25, 15, 1.00, false);
-				
 	        }
 			
 		]]>
@@ -209,10 +209,11 @@
     		icon="@Embed(source='assets/icons/gate.png')" 
     		label="{Application.application.dictionary.getLabel('gate_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('gate_btn_tooltip')}"/>
-    	<mx:Button height="25" 
-    		icon="@Embed(source='assets/icons/branch.png')" 
-    		label="{Application.application.dictionary.getLabel('branch_btn')}"
-    		toolTip="{Application.application.dictionary.getLabel('branch_btn_tooltip')}"/>
+    	<toolbar:SystemToolComponent type="{Constants.SYSTEM_ACTIVITY_TYPE_BRANCH}" height="25" 
+    		click="mouseClick(event)"
+    		icon="@Embed(source='assets/icons/gate.png')" 
+    		label="{Application.application.dictionary.getLabel('gate_btn')}" 
+    		toolTip="{Application.application.dictionary.getLabel('gate_btn_tooltip')}"/>
     		
     	<mx:Button height="25" 
     		icon="@Embed(source='assets/icons/converge.png')" 
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as
===================================================================
diff -u -rbbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision bbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/transition/TransitionComponent.as	(.../TransitionComponent.as)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -16,6 +16,15 @@
 	{
 		public var toActivity:ActivityComponent;
 		public var fromActivity:ActivityComponent;
+		
+		// This flag is set if when the transition is created, the source activty alread has an out transition
+		public var possibleBranch:Boolean = false;
+		
+		// A variable used in the controller for possible branch transitions
+		// Used to generate branch points where needed.
+		public var possibleFirstActivityInBranch:ActivityComponent = null;
+		
+		
 
 		public function TransitionComponent()
 		{
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -7,6 +7,7 @@
 	import mx.controls.Alert;
 	import mx.core.Application;
 	import mx.core.UIComponent;
+	import mx.events.CloseEvent;
 	import mx.events.DragEvent;
 	
 	import org.lamsfoundation.lams.author.components.CanvasBox;
@@ -18,9 +19,8 @@
 	import org.lamsfoundation.lams.author.components.activity.group.RandomGroupActivityComponent;
 	import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent;
 	import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
-	import org.lamsfoundation.lams.author.events.AuthorActivityEvent;
-	import org.lamsfoundation.lams.author.events.TransitionEvent;
 	import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
+	import org.lamsfoundation.lams.author.util.AuthorUtil;
 	import org.lamsfoundation.lams.author.util.Constants;
 	import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
 	
@@ -29,12 +29,26 @@
 		
 		private var dictionaryFallback:XML;
 		
+		private static var _instance:AuthorController;
+		
+		
 	 	public var transitionArray:ArrayCollection = new ArrayCollection();
 	 	
 	 	public var activities:Dictionary = new Dictionary();
 		
-		public function AuthorController(){}
+		public function AuthorController(){
+			if (_instance != null) {
+				throw new Error("This is a singleton, do not instantiate, instead use AuthorController.instance");
+			}
+		}
 		
+		public static function get instance():AuthorController {
+			if (_instance == null) {
+				_instance = new AuthorController();
+			}
+			return _instance;
+		}
+		
 		/**
 		 * Sets the learningLibrary object on startup.
 		 * 
@@ -57,7 +71,6 @@
    			// Set the application learning library
    			Application.application.learningLibrary = learningLibrary;
    			Application.application.canvasArea.compLearningLibrary.loadLearningLibrary();
-   			//Application.application.canvasArea.compLearningLibrary2.loadLearningLibrary();
 		}
 		
 		
@@ -81,7 +94,7 @@
 			// Get the current mouse point, and convert it to co-ordinates in CanvasBox
 			var comp:UIComponent = UIComponent(event.currentTarget);
 			var currentMousePoint:Point = new Point(comp.mouseX, comp.mouseY);
-			currentMousePoint = canvasBox.globalToLocal(currentMousePoint);	
+			//currentMousePoint = canvasBox.globalToLocal(currentMousePoint);	
 			
 			// This condition is true if the activity was already on the canvas
 			if (event.dragInitiator is ActivityComponent) {
@@ -124,8 +137,8 @@
 	                	toolActivityComponent.toolContentID = toolContentID;
 	                	toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0];
 	                	toolActivityComponent.load(nextActivityUIID)
-						toolActivityComponent.x = currentMousePoint.x;
-	              		toolActivityComponent.y = currentMousePoint.y;
+						toolActivityComponent.x = currentMousePoint.x  - toolActivityComponent.mouseOffSetX;
+	              		toolActivityComponent.y = currentMousePoint.y  - toolActivityComponent.mouseOffSetY;
 	                	canvasBox.addChild(toolActivityComponent);
 	                	toolActivityComponent.setCenter();
 	                	toolActivityComponent.selectActivity();
@@ -175,6 +188,16 @@
 		                	learnerGroup.selectActivity();
 		                	activities[nextActivityUIID] = learnerGroup;
 	            			break;
+	            		case Constants.SYSTEM_ACTIVITY_TYPE_BRANCH:
+	            			var branchPoint:BranchPoint = new BranchPoint;
+	            			branchPoint.x = currentMousePoint.x;
+			              	branchPoint.y = currentMousePoint.y;
+			              	canvasBox.addChild(branchPoint);
+		                	branchPoint.setCenter();
+		                	branchPoint.load(nextActivityUIID);
+		                	branchPoint.selectActivity();
+		                	activities[nextActivityUIID] = branchPoint;
+	            			break;
 	            	}
 	            }	
             }
@@ -197,34 +220,52 @@
 		 * 
 		 * @param event The transition event fired by the source activity
 		 */ 
-		public function drawTransition(event:TransitionEvent):void {
+		public function drawTransition(sourceActivityComponent:ActivityComponent, transition:TransitionComponent):void {
 			
 			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
 			var validTransition:Boolean = false;
 			for (var i:int = 0; i < canvasBox.numChildren; i++) {
 		    		
 	    		if (canvasBox.getChildAt(i) is ActivityComponent) {
 	    			
-	    			var activityComponent:ActivityComponent = canvasBox.getChildAt(i) as ActivityComponent;
-	    			if (activityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && activityComponent.canAcceptTransitions) {
+	    			var destActivityComponent:ActivityComponent = canvasBox.getChildAt(i) as ActivityComponent;
+	    			if (destActivityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && destActivityComponent.canAcceptTransitions) {
 	    				
 	    				
-	    				var validationString:String = validateTransition(event, activityComponent);
-	    				if (validationString == "valid") {
-	    					validTransition = true;	
-	    					
-	    					// Apply the transition
-	    					transitionArray.addItem(event.transition);
-	    					event.sourceAcivityComponent.state = Constants.ACTIVITY_STATE_NORMAL;
-	    					activityComponent.transitionIn = event.transition;	
-	    					event.transition.toActivity = activityComponent;
-	    					event.sourceAcivityComponent.transitionOut = event.transition;
-	    					activityComponent.updateTransitionPositions();
-							event.sourceAcivityComponent.updateTransitionPositions();
-	    				} else {
-	    					Alert.show(validationString);
-	    				}
+	    				var validationString:String = validateTransition(transition, sourceActivityComponent, destActivityComponent);
 	    				
+	    				switch (validationString) {
+	    					case "valid": 
+		    					validTransition = true;	
+		    					
+		    					// Apply the transition
+		    					transitionArray.addItem(transition);
+		    					sourceActivityComponent.state = Constants.ACTIVITY_STATE_NORMAL;
+		    					destActivityComponent.transitionIn = transition;	
+		    					transition.toActivity = destActivityComponent;
+		    					sourceActivityComponent.transitionOut = transition;
+		    					destActivityComponent.updateTransitionPositions();
+								sourceActivityComponent.updateTransitionPositions();
+								break;
+							case "branchAttempt":
+								validTransition = true;	
+								Alert.show("Looks like your trying to create a branch. Do you want to generate a branch point?","",
+									Alert.OK|Alert.CANCEL,Application.application.canvasArea,
+									function clickListener(event:CloseEvent):void {
+										if (event.detail == Alert.OK) {
+											automaticallyGenerateBranch(transition, sourceActivityComponent, destActivityComponent);
+										} else {
+											Alert.show("no");
+										}
+									}
+									
+									,null,Alert.OK);
+								break;
+							default:
+								Alert.show(validationString);
+								break;
+	    				}
+
 	    				// Return cursor state to normal
 	    				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);			
 	    				break;
@@ -233,9 +274,9 @@
 	    	}
 	    	
 	    	if (!validTransition) {
-	    		event.transition.graphics.clear();
-	    		canvasBox.removeChild(event.transition);
-	    		event.sourceAcivityComponent.transitionOut = null;
+	    		transition.graphics.clear();
+	    		canvasBox.removeChild(transition);
+	    		sourceActivityComponent.transitionOut = null;
 	    	}
 		}
 		
@@ -248,16 +289,21 @@
 		 * @return "valid" if valid, otherwise the translated error message.
 		 * 
 		 */
-		public function validateTransition(event:TransitionEvent, destActivity:ActivityComponent):String {
+		public function validateTransition(transition:TransitionComponent, sourceActivity:ActivityComponent, destActivity:ActivityComponent):String {
 			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
 			
+			// Check if there is more than one transition coming our of the source activity
+			if (transition.possibleBranch) {
+				return "branchAttempt";
+			}
+			
 			// Check if the destination activity already has a transition
 			if (destActivity.transitionIn != null) {
 				return Application.application.dictionary.getLabelAndInsert("cv_invalid_trans_target_to_activity", [destActivity.title.text]);
 			}
 			
 			// Check if there is a circuit
-			if (isLoopingLearningDesign(event.sourceAcivityComponent, destActivity)){
+			if (isLoopingLearningDesign(sourceActivity, destActivity)){
 				return Application.application.dictionary.getLabel("cv_invalid_trans_circular_sequence");
 			}
 			
@@ -289,21 +335,65 @@
 			}
 		}
 		
+		private function automaticallyGenerateBranch(transition:TransitionComponent, sourceActivity:ActivityComponent, destActivity:ActivityComponent):void {
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			
+			var destActivity2:ActivityComponent = sourceActivity.transitionOut.possibleFirstActivityInBranch;
+			
+			// Remove old transitions
+        	deleteTransition(transition.possibleFirstActivityInBranch.transitionIn);
+        	deleteTransition(transition);
+			
+			var sourcePoint:Point = new Point(sourceActivity.centerX, sourceActivity.centerY);
+			
+			// Find midpoint between two dest activities
+			var midPoint:Point = AuthorUtil.getMidpoint(new Point(destActivity.x, destActivity.y),new Point(destActivity2.x, destActivity2.y));
+			
+			// Find point 30 pixels away from the source activity in the direction of the midpoint
+			// This is the point of the branch point
+			var resultPoint:Point = Point.interpolate(sourcePoint, midPoint, 0.5);
+			
+			var nextActivityUIID:int = getNewUIID();
+			
+			// Add the branch point to the canvas
+			var branchPoint:BranchPoint = new BranchPoint();
+        	canvasBox.addChild(branchPoint);
+        	branchPoint.x = resultPoint.x;
+          	branchPoint.y = resultPoint.y;
+          	
+        	branchPoint.load(nextActivityUIID);
+        	branchPoint.selectActivity();
+        	activities[nextActivityUIID] = branchPoint;	
+        	
+        	// Create the transition to the branch activity
+        	var transition:TransitionComponent = new TransitionComponent();
+        	canvasBox.addChild(transition);
+        	transition.startX = sourceActivity.centerX;
+        	transition.startY = sourceActivity.centerY;
+        	transition.endX = branchPoint.centerX;
+        	transition.endY = branchPoint.centerY;
+        	transition.toActivity = branchPoint;
+        	transition.fromActivity = sourceActivity;
+        	
+        	// link with activities
+        	sourceActivity.transitionOut = transition;
+        	branchPoint.transitionIn = transition;
+        	branchPoint.updateTransitionPositions();
+        	sourceActivity.updateTransitionPositions();
+        	
+		}
 		
 		/**
 		 * This function is invoked when an activity is dragged into the bin
 		 * it deletes the activity and any related transitions
 		 * 
 		 * TODO: Check the state of the LD and set it to invalid if neccessary
 		 * 
-		 * @param event AuthorActivityEvent containing the acitvity object
+		 * @param activityComponent the acitvity object
 		 * 
 		 */
-		public function deleteActivity(event:AuthorActivityEvent):void {
-			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
-				
-			var activityComponent:ActivityComponent = event.activityComponent;
-			
+		public function deleteActivity(activityComponent:ActivityComponent):void {
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;			
 			activityComponent.deSelectActivity();
 			
 			// Remove transition in, if needed
@@ -327,25 +417,31 @@
 			activityComponent = null;
 		}
 		
-		
 		/**
 		 * This function is invoked when a transition is dropped into the bin
 		 * it deletes the transition
 		 * 
 		 * TODO: Check the state of the LD and set it to invalid if neccessary
 		 * 
-		 * @param event the TransitionEvent
+		 * @param transition
 		 */
-		public function deleteTransition(event:TransitionEvent): void {
+		public function deleteTransition(transition:TransitionComponent):void {
 			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
 			
-			var transition:TransitionComponent = event.transition;
-			
-			transitionArray.removeItemAt(transitionArray.getItemIndex(transition));
-			transition.fromActivity.transitionOut = null;
-			transition.toActivity.transitionIn = null;
-			transition = null;
-			
+			if (transition != null) {
+				if (transitionArray.getItemIndex(transition) != -1) {
+					transitionArray.removeItemAt(transitionArray.getItemIndex(transition));
+				}
+				if (transition.fromActivity != null) {
+					transition.fromActivity.transitionOut = null;
+				} 
+				if (transition.toActivity != null) {
+					transition.toActivity.transitionIn = null;
+				}
+				
+				canvasBox.removeChild(transition);
+				transition = null;
+			}
 		}
 		
 		private function getNewUIID():int{
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as
===================================================================
diff -u -rbbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as	(.../TransitionEvent.as)	(revision bbf05bc0eb7a947272cb76a9e9c5b1093cd54e2c)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as	(.../TransitionEvent.as)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -10,7 +10,7 @@
 		public static const DELETE_TRANSITION:String = "deleteTransition";
 		
 		
-		public var sourceAcivityComponent:ActivityComponent;
+		public var sourceActivityComponent:ActivityComponent;
 		public var transition:TransitionComponent;
 		public var localY:int;
 		public var localX:int;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -132,32 +132,7 @@
 		</HTTPServiceInvoker>
 		
 	</EventHandlers>
-	
-	<!-- INTERNAL EVENTS _______________________________________________________________________-->
-	
-	<!-- Event fires when a traniition finishes -->
-	<EventHandlers type="{TransitionEvent.TRANSITION_COMPLETE}">
-		<MethodInvoker generator="{AuthorController}" method="drawTransition" arguments="{[event]}" />
-	</EventHandlers>
-	
-	<!-- Event fires when you drop an activity directly on the canvas -->
-	<EventHandlers type="{DropActivityEvent.DROP_ACTIVITY_EVENT}">
-		<MethodInvoker generator="{AuthorController}" method="dropActivity" arguments="{[event]}" />
-	</EventHandlers>
-	
-	<!-- Event fires when you drop an activity into the bin -->
-	<EventHandlers type="{AuthorActivityEvent.DELETE_ACTIVITY_EVENT}">
-		<MethodInvoker generator="{AuthorController}" method="deleteActivity" arguments="{[event]}" />
-	</EventHandlers>
-	
-	<!-- Event fires when you drop a transitions into the bin -->
-	<EventHandlers type="{TransitionEvent.DELETE_TRANSITION}">
-		<MethodInvoker generator="{AuthorController}" method="deleteTransition" arguments="{[event]}" />
-	</EventHandlers>
-	<!-- /INTERNAL EVENTS ________________________________________________________________________-->
-	
-	
-	
+
 	<!-- ======================================================================================== -->
 	<!-- Services   Note: you can have an external file if you have more services -->
 	<!-- _________________________________________________________________________________________ -->
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
@@ -0,0 +1,47 @@
+package org.lamsfoundation.lams.author.util
+{
+	import flash.display.BitmapData;
+	import flash.display.Bitmap;
+	import flash.display.DisplayObject;
+	import flash.geom.Matrix;
+	import flash.geom.Point;
+	
+	import mx.controls.Image;
+	
+	public class AuthorUtil
+	{
+		public function AuthorUtil(){}
+		
+		/**
+		 * Gets the midpoint between the two points
+		 * (x1 + x2)/2 , (y1 + y2)/2
+		 * 
+		 * @param point1
+		 * @param point2
+		 * @return 
+		 * 
+		 */
+		public static function getMidpoint(point1:Point, point2:Point):Point {
+			var x:Number = (point1.x + point2.x) / 2;
+			var y:Number = (point1.y + point2.y) / 2;
+			return new Point(x,y);
+		}
+		
+		
+		public static function getBitmapData(target:DisplayObject):BitmapData
+		{
+			var bd:BitmapData = new BitmapData( target.width, target.height );
+			var m:Matrix = new Matrix();
+			bd.draw( target, m );
+			return bd;
+	   	}
+	   	
+	   	public static function getImage(target:DisplayObject):Image
+		{
+			var image:Image = new Image();
+	        image.source = new Bitmap(getBitmapData(target));
+			return image;
+	   	}
+
+	}
+}
\ No newline at end of file