Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r7f5de60cba2fa6ed056786c5461af6e29518723f -r784fd323a58e84e5d935014177523105f1e99b84
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7f5de60cba2fa6ed056786c5461af6e29518723f)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 784fd323a58e84e5d935014177523105f1e99b84)
@@ -19,8 +19,6 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.dialogextend.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.simple-color.js"></script>
-	<!-- Fix for iPad -->
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.ui.touch-punch.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/yahoo-dom-event.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/animation-min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/yui/json-min.js" ></script> 
@@ -292,7 +290,7 @@
 		</div>
 
 		<div class="btn-group btn-group-sm">
-			<button type="button" class="btn btn-default" onClick="javascript:MenuLib.saveLearningDesign()">
+			<button id="saveButton" type="button" class="btn btn-default" onClick="javascript:MenuLib.saveLearningDesign()">
 				<i class="fa fa-save"></i>
 				<span><fmt:message key="authoring.fla.page.menu.save" /></span>
 			</button>
@@ -370,7 +368,7 @@
 		  </ul>
 		</div>
 				
-		<button id="arrangeButton " class="btn btn-default desktopButton" onClick="javascript:GeneralLib.arrangeActivities()">
+		<button id="arrangeButton" class="btn btn-default desktopButton" onClick="javascript:GeneralLib.arrangeActivities()">
 			<i class="fa fa-th"></i> 
 			<span><fmt:message key="authoring.fla.page.menu.arrange" /></span>
 		</button>
@@ -390,7 +388,7 @@
 				<select>
 					<option><fmt:message key="authoring.fla.tool.groups.all" /></option>
 				</select>
-				<div class="templateContainer">
+				<div class="templateContainer scrollable">
 					<c:forEach var="tool" items="${tools}">
 						<div class="tooltemplate">
 						<div
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -rc8951612340926e322a2a1bdceaf97341641d82b -r784fd323a58e84e5d935014177523105f1e99b84
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision c8951612340926e322a2a1bdceaf97341641d82b)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision 784fd323a58e84e5d935014177523105f1e99b84)
@@ -17,6 +17,11 @@
 		
 		if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)){
 			$('.desktopButton').hide();
+			
+			document.addEventListener("touchstart", HandlerLib.touchHandler, true);
+			document.addEventListener("touchmove", HandlerLib.touchHandler, true);
+			document.addEventListener("touchend", HandlerLib.touchHandler, true);
+			document.addEventListener("touchcancel", HandlerLib.touchHandler, true);
 		}
 	}
 	
@@ -984,6 +989,8 @@
 	 * Sorts activities on canvas.
 	 */
 	arrangeActivities : function(activities){
+		$('#arrangeButton').blur();
+		
 		// when importing parts of another LD, activities get appended and only they get sorted
 		var append = activities,
 			activities = activities || layout.activities;
Index: lams_central/web/includes/javascript/authoring/authoringHandler.js
===================================================================
diff -u -r7e450026a56b1f065c08bcee3eadcde6d0844d7d -r784fd323a58e84e5d935014177523105f1e99b84
--- lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 7e450026a56b1f065c08bcee3eadcde6d0844d7d)
+++ lams_central/web/includes/javascript/authoring/authoringHandler.js	(.../authoringHandler.js)	(revision 784fd323a58e84e5d935014177523105f1e99b84)
@@ -6,7 +6,60 @@
  * Contains general (canvas, group of shapes) action handlers
  */
 var HandlerLib = {
+	// taken from http://jsfiddle.net/LQuyr/8/
+	touchHandler : function(event) {
+	    var self = this,
+	    	touches = event.changedTouches,
+	        first = touches[0],
+	        type = "";
+
+	    switch (event.type) {
+	    case "touchstart":
+	        type = "mousedown";
+	        window.startY = event.pageY;
+	        break;
+	    case "touchmove":
+	        type = "mousemove";
+	        break;
+	    case "touchend":
+	        type = "mouseup";
+	        break;
+	    default:
+	        return;
+	    }
+	    var simulatedEvent = document.createEvent("MouseEvent");
+	    simulatedEvent.initMouseEvent(type, true, true, window, 1, first.screenX, first.screenY,
+	    		first.clientX, first.clientY, false, false, false, false, 0 /*left*/ , null);
+
+	    first.target.dispatchEvent(simulatedEvent);
+
+	    var scrollables = [],
+	    	clickedInScrollArea = false,
+	    	// check if any of the parents has is-scollable class
+	    	parentEls = $(event.target).parents().map(function() {
+	        try {
+	            if ($(this).hasClass('scrollable')) {
+	                clickedInScrollArea = true;
+	                // get vertical direction of touch event
+	                var direction = (window.startY < first.clientY) ? 'down' : 'up';
+	                // calculate stuff... :o)
+	                if ((($(this).scrollTop() <= 0) && (direction === 'down'))
+	                		|| (($(this).height() <= $(this).scrollTop()) && (direction === 'up')) ){
+
+	                } else {
+	                    scrollables.push(this);
+	                }
+	            }
+	        } catch (e) {}
+	    });
+	    
+	    // if not, prevent default to prevent bouncing
+	    if ((scrollables.length === 0) && (type === 'mousemove')) {
+	        event.preventDefault();
+	    }
+	},
 		
+	
 	/**
 	 * Remove activity selection when user clicks on canvas.
 	 */
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r7f5de60cba2fa6ed056786c5461af6e29518723f -r784fd323a58e84e5d935014177523105f1e99b84
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 7f5de60cba2fa6ed056786c5461af6e29518723f)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 784fd323a58e84e5d935014177523105f1e99b84)
@@ -172,78 +172,96 @@
 	 * Creates a new grouping activity.
 	 */
 	addGrouping : function() {
-		HandlerLib.resetCanvasMode();
-		
-		canvas.css('cursor', 'url("' + layout.toolMetadata.grouping.iconPath + '"), move')
-			  .click(function(event){
-			// pageX and pageY tell event coordinates relative to the whole page
-			// we need relative to canvas
-			var translatedEvent = GeneralLib.translateEventOnCanvas(event),
-				x = translatedEvent[0] - 47,
-				y = translatedEvent[1] -  2;
-
-			layout.activities.push(new ActivityDefs.GroupingActivity(null, null, x, y));
-			
-			GeneralLib.setModified(true);
+		if (layout.isGroupingStarted) {
+			layout.isGroupingStarted = false;
 			HandlerLib.resetCanvasMode(true);
-		});
+			$('#groupButton').blur();
+		} else {
+			layout.isGroupingStarted = true;
+			HandlerLib.resetCanvasMode();
+			
+			canvas.css('cursor', 'url("' + layout.toolMetadata.grouping.iconPath + '"), move')
+				.click(function(event){
+					layout.isGroupingStarted = false;
+					// pageX and pageY tell event coordinates relative to the whole page
+					// we need relative to canvas
+					var translatedEvent = GeneralLib.translateEventOnCanvas(event),
+						x = translatedEvent[0] - 47,
+						y = translatedEvent[1] -  2;
+		
+					layout.activities.push(new ActivityDefs.GroupingActivity(null, null, x, y));
+					
+					GeneralLib.setModified(true);
+					HandlerLib.resetCanvasMode(true);
+				});
+		}
 	},
 	
 
 	/**
 	 * Creates a new optional activity.
 	 */
 	addOptionalActivity : function() {
-		HandlerLib.resetCanvasMode();
+			HandlerLib.resetCanvasMode();
+			
+			$('.modal-body', layout.infoDialog).text(LABELS.OPTIONAL_ACTIVITY_PLACE_PROMPT);
+			layout.infoDialog.modal('show');
 		
-		$('.modal-body', layout.infoDialog).text(LABELS.OPTIONAL_ACTIVITY_PLACE_PROMPT);
-		layout.infoDialog.modal('show');
+			canvas.css('cursor', 'pointer').click(function(event){
+				$('.modal-body', layout.infoDialog).empty();
+				layout.infoDialog.modal('hide');
 	
-		canvas.css('cursor', 'pointer').click(function(event){
-			$('.modal-body', layout.infoDialog).empty();
-			layout.infoDialog.modal('hide');
-
-			var translatedEvent = GeneralLib.translateEventOnCanvas(event),
-				x = translatedEvent[0],
-				y = translatedEvent[1];
-			
-			GeneralLib.setModified(true);
-			HandlerLib.resetCanvasMode(true);
-
-			layout.activities.push(new ActivityDefs.OptionalActivity(null, null, x, y));
-		});
+				var translatedEvent = GeneralLib.translateEventOnCanvas(event),
+					x = translatedEvent[0],
+					y = translatedEvent[1];
+				
+				GeneralLib.setModified(true);
+				HandlerLib.resetCanvasMode(true);
+	
+				layout.activities.push(new ActivityDefs.OptionalActivity(null, null, x, y));
+			});
 	},
 	
 
 	/**
 	 * Creates a new transition.
 	 */
 	addTransition : function() {
-		HandlerLib.resetCanvasMode();
-		
-		$('.modal-body', layout.infoDialog).text(LABELS.TRANSITION_PLACE_PROMPT);
-		layout.infoDialog.modal('show');
-		
-		canvas.css('cursor', 'pointer').click(function(event){
-			$('.modal-body', layout.infoDialog).empty();
-			layout.infoDialog.modal('hide');
+		if (layout.isTransitionStarted) {
+			layout.isTransitionStarted = false;
+			HandlerLib.resetCanvasMode(true);
+			$('#transitionButton').blur();
+		} else {
+			layout.isTransitionStarted = true;
+			HandlerLib.resetCanvasMode();
 			
-			var startActivity = null,
-				targetElement = Snap.getElementByPoint(event.pageX, event.pageY);
-			if (targetElement) {
-				startActivity = ActivityLib.getParentObject(targetElement);
-				if (startActivity) {
-					HandlerTransitionLib.drawTransitionStartHandler(startActivity, null, event.pageX, event.pageY);
+			$('.modal-body', layout.infoDialog).text(LABELS.TRANSITION_PLACE_PROMPT);
+			layout.infoDialog.modal('show');
+			
+			canvas.css('cursor', 'pointer').click(function(event){
+				layout.isTransitionStarted = false;
+				
+				$('.modal-body', layout.infoDialog).empty();
+				layout.infoDialog.modal('hide');
+				
+				var startActivity = null,
+					targetElement = Snap.getElementByPoint(event.pageX, event.pageY);
+				if (targetElement) {
+					startActivity = ActivityLib.getParentObject(targetElement);
+					if (startActivity) {
+						HandlerTransitionLib.drawTransitionStartHandler(startActivity, null, event.pageX, event.pageY);
+					}
 				}
-			}
-		});
+			});
+		}
 	},
 	
 	
 	/**
 	 * Mark an activity as ready for pasting.
 	 */
 	copyActivity : function(){
+		$('#copyButton').blur();
 		layout.copiedActivity = layout.selectedObject;
 	},
 	
@@ -554,6 +572,8 @@
 	 * Make a copy of an existing activity.
 	 */
 	pasteActivity : function(){
+		$('#pasteButton').blur();
+		
 		var activity = layout.copiedActivity;
 		if (!activity) {
 			return;
@@ -628,6 +648,8 @@
 	 * Opens "Save sequence" dialog where an user can choose where to save the Learning Design.
 	 */
 	saveLearningDesign : function(showDialog){
+		$('#saveButton').blur();
+		
 		if (!showDialog && layout.ld.learningDesignID) {
 			GeneralLib.saveLearningDesign(layout.ld.folderID, layout.ld.learningDesignID, layout.ld.title);
 			return;
@@ -651,4 +673,4 @@
 			$('.templateContainer').height($('#ldDescriptionDiv').height() + $('#canvas').height() - 10);
 		});
 	}
-};
+};
\ No newline at end of file