Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5bc88174180046cd153cfc46a0c8ef13675bd4bf -rbca8248580df6c46e6a8462d80e4341598cd9f28
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5bc88174180046cd153cfc46a0c8ef13675bd4bf)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
@@ -825,8 +825,10 @@
 authoring.msg.close.cancel.save = Do you want to close this window without saving?
 authoring.msg.list.cancel.save = Do you want to return to the wizard list without saving?
 authoring.fla.page.menu.new.template = Use Learning Design Wizards
+authoring.fla.page.menu.new.ai = Use AI Wizard
 authoring.template.list.introduction = Select a teaching strategy to explore it.
 authoring.learning.design.templates = Learning Design Wizards
+authoring.learning.design.ai.wizard = Learning Design AI Wizard
 authoring.template.successful = Your design has been saved as {0}.
 authoring.label.sequence.title = Name
 authoring.error.question.correct.num = RAT Questions: One of the answers for Question {0} needs to be correct.
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
===================================================================
diff -u -ra40a77e307317e8038ed9e6b8699c18386286497 -rbca8248580df6c46e6a8462d80e4341598cd9f28
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision a40a77e307317e8038ed9e6b8699c18386286497)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
@@ -72,6 +72,7 @@
 import org.lamsfoundation.lams.usermanagement.exception.UserException;
 import org.lamsfoundation.lams.usermanagement.exception.WorkspaceFolderException;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -136,10 +137,13 @@
 	request.setAttribute("access", JsonUtil.toString(accessList));
 	request.setAttribute("licenses", authoringService.getAvailableLicenses());
 
-	boolean canSetReadOnly = userManagementService.isUserAppAdmin()
-		|| userManagementService.isUserGlobalGroupManager();
+	boolean canSetReadOnly =
+		userManagementService.isUserAppAdmin() || userManagementService.isUserGlobalGroupManager();
 	request.setAttribute("canSetReadOnly", canSetReadOnly);
 
+	boolean aiEnabled = Configuration.isLamsModuleAvailable(Configuration.AI_MODULE_CLASS);
+	request.setAttribute(AttributeNames.ATTR_IS_AI_ENABLED, aiEnabled);
+
 	return "authoring/authoring";
     }
 
@@ -223,8 +227,8 @@
 	try {
 	    authoringService.finishEditOnFly(learningDesignID, getUserId(), cancelled);
 	} catch (Exception e) {
-	    String errorMsg = "Error occured ending EditOnFly" + e.getMessage() + " learning design id "
-		    + learningDesignID;
+	    String errorMsg =
+		    "Error occured ending EditOnFly" + e.getMessage() + " learning design id " + learningDesignID;
 	    log.error(errorMsg, e);
 	    throw new IOException(e);
 	}
@@ -320,8 +324,8 @@
 	    // if learning library ID is not set explicitly, derive it from tool
 	    learningLibraryID = tool.getLearningLibraryId();
 	}
-	WebApplicationContext wac = WebApplicationContextUtils
-		.getRequiredWebApplicationContext(applicationContext.getServletContext());
+	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(
+		applicationContext.getServletContext());
 	ToolContentManager toolManager = (ToolContentManager) wac.getBean(tool.getServiceName());
 	String title = toolManager.getToolContentTitle(toolContentID);
 	if (title == null || title.trim().length() == 0) {
@@ -419,8 +423,7 @@
     }
 
     /**
-     * Updates an existing activity coordinates.
-     * It is run when SVG gets recreated in Monitoring or Add Lesson dialog
+     * Updates an existing activity coordinates. It is run when SVG gets recreated in Monitoring or Add Lesson dialog
      * and activities need to be rearranged as one of them is a branching designed in the old Flash Authoring.
      */
     @ResponseBody
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -rbca8248580df6c46e6a8462d80e4341598cd9f28
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
@@ -135,6 +135,8 @@
 				INPUT_DETACHED_ERROR : decoderDiv.html('<c:out value="${INPUT_DETACHED_ERROR_VAR}" />').text(),
 				<fmt:message key="authoring.learning.design.templates" var="TEMPLATES_VAR"/>
 				TEMPLATES : decoderDiv.html('<c:out value="${TEMPLATES_VAR}" />').text(),
+				<fmt:message key="authoring.learning.design.ai.wizard" var="AI_WIZARD_VAR"/>
+				AI_WIZARD : decoderDiv.html('<c:out value="${AI_WIZARD_VAR}" />').text(),
 				<fmt:message key="authoring.fla.page.menu.apply.changes" var="LIVE_EDIT_SAVE_VAR"/>
 				LIVE_EDIT_SAVE : decoderDiv.html('<c:out value="${LIVE_EDIT_SAVE_VAR}" />').text(),
 				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
@@ -313,6 +315,7 @@
 				<span class="sr-only">Toggle Dropdown</span>
 			</button>
 			<ul class="dropdown-menu dropdown-menu-right desktopButton">
+				<li id="useAi" onClick="javascript:MenuLib.useAiToCreateLearningDesign()"><a href="#"><i class="fa fa-microchip text-primary"></i> <fmt:message key="authoring.fla.page.menu.new.ai" /></a></li>
 				<li id="useTemplate" onClick="javascript:MenuLib.useTemplateToCreateLearningDesign()"><a href="#"><fmt:message key="authoring.fla.page.menu.new.template" /></a></li>
 			</ul>
 		</div>
@@ -1160,4 +1163,4 @@
 		</div>
 	</div>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringMenu.js
===================================================================
diff -u -r57d5bb83f49b691633de2f85b6c7c722108e2c3c -rbca8248580df6c46e6a8462d80e4341598cd9f28
--- lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision 57d5bb83f49b691633de2f85b6c7c722108e2c3c)
+++ lams_central/web/includes/javascript/authoring/authoringMenu.js	(.../authoringMenu.js)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
@@ -8,34 +8,34 @@
 	 */
 	addAnnotationLabel : function() {
 		HandlerLib.resetCanvasMode();
-		
+
 		layout.infoDialog.data('show')(LABELS.ANNOTATION_LABEL_PLACE_PROMPT, true);
 
 		canvas.css('cursor', 'pointer').click(function(event){
 			layout.infoDialog.modal('hide');
 			var translatedEvent = GeneralLib.translateEventOnCanvas(event),
 				x = translatedEvent[0],
 				y = translatedEvent[1];
-			
+
 			HandlerLib.resetCanvasMode(true);
-			
+
 			DecorationLib.addLabel(x, y);
 		});
 	},
-	
-	
+
+
 	/**
 	 * Creates a new annotation Region.
 	 */
 	addAnnotationRegion : function() {
 		HandlerLib.resetCanvasMode();
-		
+
 		layout.infoDialog.data('show')(LABELS.ANNOTATION_REGION_PLACE_PROMPT, true);
-	
+
 		canvas.css('cursor', 'crosshair').mousedown(function(event){
 			layout.infoDialog.modal('hide');
 			var	targetElement = Snap.getElementByPoint(event.pageX, event.pageY);
-			
+
 			if (targetElement.type == 'svg') {
 				HandlerDecorationLib.drawRegionStartHandler(event);
 			} else {
@@ -44,8 +44,8 @@
 			}
 		});
 	},
-	
-	
+
+
 	/**
 	 * Creates a new transition.
 	 */
@@ -58,14 +58,14 @@
 		} else {
 			layout.isTransitionStarted = true;
 			HandlerLib.resetCanvasMode();
-			
+
 			layout.infoDialog.data('show')(LABELS.TRANSITION_PLACE_PROMPT, true);
-			
+
 			canvas.css('cursor', 'pointer').click(function(event){
 				layout.isTransitionStarted = false;
-				
+
 				layout.infoDialog.modal('hide');
-				
+
 				var startActivity = null,
 					targetElement = Snap.getElementByPoint(event.pageX, event.pageY);
 				if (targetElement) {
@@ -77,24 +77,24 @@
 			});
 		}
 	},
-	
+
 	/**
 	 * Mark an activity as ready for pasting.
 	 */
 	copyActivity : function(){
 		$('#copyButton').blur();
 		layout.copiedActivity = layout.selectedObject;
 	},
-	
 
+
 	/**
 	 * Opens a pop up for exporting LD.
 	 */
 	exportLearningDesign : function(){
 		if (layout.modified || layout.activities.length == 0) {
 			return;
 		}
-		
+
 		// dialog for downloading the sequence as ZIP
 		var exportLDDialog = showDialog('exportLDDialog',{
 			'autoOpen' : false,
@@ -108,46 +108,46 @@
 				//dynamically create a form and submit it
 				var exportExcelUrl = LAMS_URL + 'authoring/exportToolContent/export.do?learningDesignID=' + layout.ld.learningDesignID;
 				var form = $('<form method="post" action="' + exportExcelUrl + '"></form>');
-			    var hiddenInput = $('<input type="hidden" name="' + csrfTokenName + '" value="' + csrfTokenValue + '"></input>');
-			    form.append(hiddenInput);
-			    $(document.body).append(form);
-			    form.submit();
+				var hiddenInput = $('<input type="hidden" name="' + csrfTokenName + '" value="' + csrfTokenValue + '"></input>');
+				form.append(hiddenInput);
+				$(document.body).append(form);
+				form.submit();
 			}
 		}, false)
-		.addClass('smallHeader')
-		.click(function(){
-			exportLDDialog.modal('hide');
-		});
+			.addClass('smallHeader')
+			.click(function(){
+				exportLDDialog.modal('hide');
+			});
 		$('#exportLDDialogContents').clone().attr('id', null).appendTo($('.modal-body', exportLDDialog).empty()).show();
 		exportLDDialog.modal('show');
 	},
 
-	
+
 	/**
 	 * Creates a SVG image out of current SVG contents.
 	 */
 	exportSVG : function(){
 		ActivityLib.removeSelectEffect();
-		
+
 		var crop = MenuLib.getCanvasCrop();
 		if (crop.x >= crop.x2) {
 			return;
 		}
 		// set viewBox so content is nicely aligned
 		var width = crop.x2 - crop.x + 2,
 			height = crop.y2 - crop.y + 2;
-			svg = $('svg', crop.canvasClone)[0];
-			
+		svg = $('svg', crop.canvasClone)[0];
+
 		// need to set attributes using pure JS as jQuery sets them with lower case, which is unacceptable in SVG
 		svg.setAttribute('viewBox', crop.x + ' ' + crop.y + ' ' + width + ' ' + height);
 		svg.setAttribute('preserveAspectRatio', 'xMinYMin slice');
 		svg.setAttribute('width', width);
 		svg.setAttribute('height', height);
 		$(svg).addClass('svg-learning-design');
-		
+
 		// reset any cursor=pointer styles
 		$('*[style*="cursor"]', svg).css('cursor', 'default');
-		
+
 		// append SVG CSS straight into SVG file
 		$.ajax({
 			'url'     : LAMS_URL + 'css/authoring-svg.css',
@@ -160,11 +160,11 @@
 				svg.appendChild(styleElement);
 			}
 		});
-		
+
 		return crop.canvasClone.html();
 	},
-	
-	
+
+
 	/**
 	 * Finds coordinates of canvas content, minus surrounding whitespace.
 	 */
@@ -175,7 +175,7 @@
 			x2 : 0,
 			y2 : 0
 		};
-		
+
 		var boxes = layout.activities.concat(layout.regions).concat(layout.labels);
 		if (layout.floatingActivity) {
 			boxes.push(layout.floatingActivity);
@@ -195,19 +195,19 @@
 				result.y2 = box.y2;
 			}
 		});
-		
+
 		var canvasClone = result.canvasClone = canvas.clone();
 		// remove the rubbish bin icon
 		canvasClone.find('#rubbishBin').remove();
 		// IE needs this. There are 2 xmlns declarations and no xmlns:xlink
 		// jQuery attr() or prop() do not work
 		var canvasHTML = canvasClone.html().replace(/xmlns="http:\/\/www.w3.org\/2000\/svg"/g, '').replace('systemLanguage=""','')
-										   .replace('<svg ', '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ');
+			.replace('<svg ', '<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ');
 		canvasClone.html(canvasHTML);
-		
+
 		return result;
 	},
-	
+
 	/**
 	 * Opens a pop up for importing LD. Loads the imported LD to canvas.
 	 */
@@ -216,27 +216,27 @@
 			return;
 		}
 		var dialog = showDialog("dialogImportLearningDesign", {
-						'modal' : true,
-						'height' : 500,
-						'width' : 850,
-						'title' : LABELS.IMPORT_DIALOG_TITLE,
-						'open' : function() {
-							var dialog = $(this);
-							// load contents after opening the dialog
-							$('iframe', dialog).attr('src', LAMS_URL + 'authoring/importToolContent/import.do').on('load', function(){
-								// override the close function so it works with the dialog, not window
-								this.contentWindow.closeWin = function(){
-									dialog.modal('hide');
-								}
-							});
-						},
-						'close' : function(){
-							// stop checking in LD was 
-							clearInterval(loadCheckInterval);
-							// completely delete the dialog
-							$(this).remove();
+				'modal' : true,
+				'height' : 500,
+				'width' : 850,
+				'title' : LABELS.IMPORT_DIALOG_TITLE,
+				'open' : function() {
+					var dialog = $(this);
+					// load contents after opening the dialog
+					$('iframe', dialog).attr('src', LAMS_URL + 'authoring/importToolContent/import.do').on('load', function(){
+						// override the close function so it works with the dialog, not window
+						this.contentWindow.closeWin = function(){
+							dialog.modal('hide');
 						}
-					}, false),
+					});
+				},
+				'close' : function(){
+					// stop checking in LD was
+					clearInterval(loadCheckInterval);
+					// completely delete the dialog
+					$(this).remove();
+				}
+			}, false),
 			currentLearningDesignID = null,
 			regEx = /learningDesignID=(\d+)/g,
 			// since window.onload does not really work after submitting a form inside the window,
@@ -249,26 +249,26 @@
 					currentLearningDesignID = match[1];
 					// load the imported LD
 					GeneralLib.openLearningDesign(currentLearningDesignID);
-					
+
 					// generate images of the imported LD
 					GeneralLib.saveLearningDesignImage();
-					
+
 					// reload user's private dir so it reflects imported LD
 					var ldTree = layout.ldStoreDialog.data('ldTree');
 					ldTreeview.refresh(ldTree, ldTree.treeview('getNode', 0));
 				}
 			}, 1000);
 	},
-	
+
 	/**
-	 * Opens "Import activities" dialog where an user can choose activities from an existing Learning Design. 
+	 * Opens "Import activities" dialog where an user can choose activities from an existing Learning Design.
 	 */
 	importPartLearningDesign : function(){
 		layout.ldStoreDialog.data('prepareForOpen')(LABELS.IMPORT_PART_DIALOG_TITLE, null,
-				'#ldStoreDialogImportPartButton, #ldStoreDialogCancelButton, #ldStoreDialogImportPartFrame', false);
+			'#ldStoreDialogImportPartButton, #ldStoreDialogCancelButton, #ldStoreDialogImportPartFrame', false);
 		layout.ldStoreDialog.modal('show');
 	},
-	
+
 	/**
 	 * Opens "Open sequence" dialog where an user can choose a Learning Design to load.
 	 */
@@ -277,19 +277,19 @@
 			return;
 		}
 		layout.ldStoreDialog.data('prepareForOpen')(LABELS.OPEN_DIALOG_TITLE, null,
-				'#ldStoreDialogOpenButton, #ldStoreDialogCancelButton', false);
+			'#ldStoreDialogOpenButton, #ldStoreDialogCancelButton', false);
 		layout.ldStoreDialog.modal('show');
 	},
 
-	
+
 	openPreview : function(){
 		if (layout.modified) {
 			// disabling the button does not do the trick, so we have to check it here
 			return;
 		}
-		
+
 		var previewButton = $('#previewButton').button('loading');
-		
+
 		// initialize, create and enter the preview lesson
 		$.ajax({
 			url : LAMS_URL + 'monitoring/monitoring/initializeLesson.do',
@@ -306,7 +306,7 @@
 					previewButton.button('reset');
 					return;
 				}
-				
+
 				$.ajax({
 					url : LAMS_URL + 'monitoring/monitoring/startPreviewLesson.do',
 					data : {
@@ -320,30 +320,30 @@
 							// open the window a bit higher than center
 							top = ((screen.height / 2) - (720 / 2)) / 2;
 						window.open(LAMS_URL + 'home/learner.do?mode=preview&lessonID='+lessonID,'Preview',
-									'width=1280,height=720,resizable,scrollbars=yes,status=yes,top=' + top + ',left=' + left);
+							'width=1280,height=720,resizable,scrollbars=yes,status=yes,top=' + top + ',left=' + left);
 						previewButton.button('reset');
 					}
 				});
 
 			}
 		});
 	},
-	
+
 	openWeights : function(){
 		layout.weightsDialog.data('prepareForOpen')();
 		layout.weightsDialog.modal('show');
 	},
-	
+
 	openQuestionBank : function(){
 		window.open(LAMS_URL + 'qb/collection/show.do', '_blank');
 	},
-	
+
 	/**
 	 * Make a copy of an existing activity.
 	 */
 	pasteActivity : function(){
 		$('#pasteButton').blur();
-		
+
 		var activity = layout.copiedActivity;
 		if (!activity) {
 			return;
@@ -358,9 +358,9 @@
 			layout.infoDialog.data('show')(LABELS.PASTE_ERROR);
 			return;
 		}
-		
+
 		// find an unqiue title for the new activity
-		var copyCount = 1, 
+		var copyCount = 1,
 			title = LABELS.ACTIVITY_COPY_TITLE_PREFIX.replace('[0]', '') + ' ' + activity.title;
 		while (true) {
 			var sameTitleFound = false;
@@ -370,15 +370,15 @@
 					return false;
 				}
 			});
-			
+
 			if (sameTitleFound) {
 				copyCount++;
 				title = LABELS.ACTIVITY_COPY_TITLE_PREFIX.replace('[0]', '(' + copyCount + ') ') + ' ' + activity.title;
 			} else {
 				break;
 			}
 		};
-		
+
 		var toolContentID = null;
 		// tool content ID can be null if the activity had the default content, i.e. was not edited yet
 		if (activity.toolContentID) {
@@ -395,31 +395,31 @@
 				}
 			});
 		}
-		
+
 		// draw the new activity next to the existing one
 		var x = activity.items.shape.getBBox().x + layout.snapToGrid.step,
 			y = activity.items.shape.getBBox().y + layout.snapToGrid.step,
 			newActivity = new ActivityDefs.ToolActivity(null, null, toolContentID, activity.toolID, activity.learningLibraryID,
-													    null, x, y, title);
+				null, x, y, title);
 		layout.activities.push(newActivity);
-		
+
 		if (activity.grouping) {
 			// add grouping effect if the existing activity had one
 			newActivity.grouping = activity.grouping;
 			newActivity.draw();
 		}
-		
+
 		GeneralLib.setModified(true);
 	},
-	
-	
+
+
 	/**
 	 * Opens "Save sequence" dialog where an user can choose where to save the Learning Design.
 	 */
 	saveLearningDesign : function(showDialog){
 		var saveButton = $('#saveButton').blur();
 		saveButton.button('loading');
-		
+
 		if (!showDialog && layout.ld.learningDesignID) {
 			if (!layout.ld.canModify || (!canSetReadOnly && layout.ld.readOnly)) {
 				alert(LABELS.READONLY_FORBIDDEN_ERROR);
@@ -429,16 +429,16 @@
 			saveButton.button('reset');
 			return;
 		}
-		
+
 		layout.ldStoreDialog.data('prepareForOpen')(LABELS.SAVE_DIALOG_TITLE, layout.ld.title,
-				'#ldStoreDialogSaveButton, #ldStoreDialogCancelButton, #ldStoreDialogNameContainer', true);
+			'#ldStoreDialogSaveButton, #ldStoreDialogCancelButton, #ldStoreDialogNameContainer', true);
 		layout.ldStoreDialog.on('shown.bs.modal', function(){
 			$('#ldStoreDialogNameContainer input', layout.ldStoreDialog).focus();
 		});
 		saveButton.button('reset');
 		layout.ldStoreDialog.modal('show');
 	},
-	
+
 	/**
 	 * Expands/collapses description field.
 	 */
@@ -448,7 +448,7 @@
 			$('.templateContainer').height($('#ldDescriptionDiv').height() + $('#canvas').height() - 10);
 		});
 	},
-	
+
 	/**
 	 * Hide / show contents of all ativity categories in the toolbar on the left
 	 */
@@ -458,7 +458,7 @@
 		$('#template-container-panel-group .collapse').collapse(isExpanded ? 'hide' : 'show');
 		collapseCategoriesButton.toggleClass('fa-chevron-circle-down fa-chevron-circle-up');
 	},
-	
+
 	/**
 	 * Hide / show activity toolbar on the left
 	 */
@@ -481,14 +481,14 @@
 				templateContainerCell.hide();
 			} else {
 				$('#template-container-collapse #template-categories-collapse-button', templateContainerCell).css('visibility', '');
-				
+
 			}
-			
+
 			GeneralLib.resizePaper();
 			rubbishBin.show();
 		});
 	},
-	
+
 	/**
 	 * Opens a pop up for template window that generates a learning design
 	 */
@@ -542,17 +542,84 @@
 					currentLearningDesignID = match[1];
 					// load the imported LD
 					GeneralLib.openLearningDesign(currentLearningDesignID);
-					
+
 					// use standard layout as if the user clicked "Arrange" button
 					GeneralLib.arrangeActivities();
-					
+
 					// save learning design after rearrange
 					MenuLib.saveLearningDesign();
-					
+
 					// reload user's private dir so it reflects imported LD
 					var ldTree = layout.ldStoreDialog.data('ldTree');
 					ldTreeview.refresh(ldTree, ldTree.treeview('getNode', 0));
 				}
 			}, 1000);
 	},
-};
+
+	/**
+	 * Opens a pop up for AI window that generates a learning design
+	 */
+	useAiToCreateLearningDesign : function(){
+		if (layout.modified && !confirm(LABELS.CLEAR_CANVAS_CONFIRM)) {
+			return;
+		}
+
+		var dialog = showDialog("aiWizard", {
+				'height' : Math.max(300, $(window).height() - 30),
+				'width' :  Math.max(380, Math.min(1280, $(window).width() - 60)),
+				'draggable' : true,
+				'resizable' : true,
+				'title' : LABELS.AI_WIZARD,
+				'beforeClose' : function(event){
+					// ask the user if he really wants to exit before saving his work
+					var iframe = $('iframe', this);
+					if (iframe[0].contentWindow.doCancel) {
+						iframe[0].contentWindow.doCancel();
+						return false;
+					}
+				},
+				'close' : function(){
+					// stop checking in LD was
+					clearInterval(loadCheckInterval);
+					$(this).remove();
+				},
+				'open' : function() {
+					var dialog = $(this);
+					// load contents after opening the dialog
+					$('iframe', dialog).attr('id','aiWizardModal').attr('src', LAMS_URL + 'ai/authoring/wizard.do').on('load', function(){
+						// override the close function so it works with the dialog, not window
+						this.contentWindow.closeWindow = function(){
+							// detach the 'beforeClose' handler above, attach the standard one and close the dialog
+							dialog.off('hide.bs.modal').on('hide.bs.modal', function(){
+								$('iframe', this).attr('src', null);
+							}).modal('hide');
+						}
+					});
+				},
+			}, true),
+			currentLearningDesignID = null,
+			regEx = /learningDesignID=(\d+)/g,
+			// since window.onload does not really work after submitting a form inside the window,
+			// this trick checks periodically for changes
+			loadCheckInterval = setInterval(function(){
+				var body = $('body', $('iframe', dialog).contents()).html(),
+					match = regEx.exec(body);
+				// check if ID was found and it's not the same as previously set
+				if (match && match[1] != currentLearningDesignID) {
+					currentLearningDesignID = match[1];
+					// load the imported LD
+					GeneralLib.openLearningDesign(currentLearningDesignID);
+
+					// use standard layout as if the user clicked "Arrange" button
+					GeneralLib.arrangeActivities();
+
+					// save learning design after rearrange
+					MenuLib.saveLearningDesign();
+
+					// reload user's private dir so it reflects imported LD
+					var ldTree = layout.ldStoreDialog.data('ldTree');
+					ldTreeview.refresh(ldTree, ldTree.treeview('getNode', 0));
+				}
+			}, 1000);
+	}
+};
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -rbca8248580df6c46e6a8462d80e4341598cd9f28
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(.../AttributeNames.java)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
@@ -100,4 +100,7 @@
     public static final String ATTR_COUNT_RATED_ITEMS = "countRatedItems";
 
     public static final String PARAM_TOOL_CONTENT_HANDLER_NAME = "toolContentHandler";
+
+    // AI stuff
+    public static final String ATTR_IS_AI_ENABLED = "isAiEnabled";
 }
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r1e85a36d6397d66fa9cc46b334e2ef2bef8af4f6 -rbca8248580df6c46e6a8462d80e4341598cd9f28
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 1e85a36d6397d66fa9cc46b334e2ef2bef8af4f6)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
@@ -219,9 +219,7 @@
     public static final String CONFIG_KEY_AUTO_EXPAND_JUSTIFICATION = "autoexpandJustification";
 
     public static final String ATTR_IS_QUESTION_ETHERPAD_ENABLED = "isQuestionEtherpadEnabled";
-    
-    public static final String ATTR_IS_AI_ENABLED = "isAiEnabled";
-    
+
     public static final String ATTR_CODE_STYLES = "codeStyles";
 
     public static final String ATTR_ALL_GROUP_USERS = "allGroupUsers";
@@ -230,4 +228,4 @@
     public static final String ANSWERS_UPDATED_SINK_NAME = "assessment learner answers updated";
 
     public static final String COMPLETION_CHARTS_UPDATE_FLUX_NAME = "assessment completion chart updated";
-}
+}
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
===================================================================
diff -u -r784731558fee35bec1bcb6ce76ecf352b5856db5 -rbca8248580df6c46e6a8462d80e4341598cd9f28
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 784731558fee35bec1bcb6ce76ecf352b5856db5)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision bca8248580df6c46e6a8462d80e4341598cd9f28)
@@ -196,8 +196,8 @@
 	    }
 	}
 
-	boolean isAssessmentAttempted = assessment.getUid() == null ? false
-		: service.isAssessmentAttempted(assessment.getUid());
+	boolean isAssessmentAttempted =
+		assessment.getUid() == null ? false : service.isAssessmentAttempted(assessment.getUid());
 	sessionMap.put(AssessmentConstants.ATTR_IS_AUTHORING_RESTRICTED, isAssessmentAttempted && mode.isTeacher());
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT_FORM, assessmentForm);
@@ -206,7 +206,7 @@
 	sessionMap.put(AssessmentConstants.ATTR_IS_QUESTION_ETHERPAD_ENABLED, questionEtherpadEnabled);
 
 	boolean aiEnabled = Configuration.isLamsModuleAvailable(Configuration.AI_MODULE_CLASS);
-	sessionMap.put(AssessmentConstants.ATTR_IS_AI_ENABLED, aiEnabled);
+	sessionMap.put(AttributeNames.ATTR_IS_AI_ENABLED, aiEnabled);
 
 	Hibernate.initialize(assessment.getSections());
 
@@ -247,7 +247,8 @@
 	Assessment assessmentPO = service.getAssessmentByContentId(assessmentForm.getAssessment().getContentId());
 
 	Set<AssessmentQuestion> oldQuestions = (assessmentPO == null) ? new HashSet<>() : assessmentPO.getQuestions();
-	Set<QuestionReference> oldReferences = (assessmentPO == null) ? new HashSet<>()
+	Set<QuestionReference> oldReferences = (assessmentPO == null)
+		? new HashSet<>()
 		: assessmentPO.getQuestionReferences();
 	Set<AssessmentSection> oldSections = (assessmentPO == null) ? new HashSet<>() : assessmentPO.getSections();
 
@@ -552,8 +553,8 @@
 	} else {
 	    //replace QbQuestion with the new version of it
 	    for (QuestionReference reference : references) {
-		if (!reference.isRandomQuestion()
-			&& oldQbQuestionUid.equals(reference.getQuestion().getQbQuestion().getUid())) {
+		if (!reference.isRandomQuestion() && oldQbQuestionUid.equals(
+			reference.getQuestion().getQbQuestion().getUid())) {
 		    AssessmentQuestion assessmentQuestion = reference.getQuestion();
 		    assessmentQuestion.setQbQuestion(qbQuestion);
 		    break;
@@ -683,8 +684,8 @@
 
 	//check whether this question is a duplicate
 	for (QuestionReference reference : references) {
-	    if (!reference.isRandomQuestion()
-		    && qbQuestionUid.equals(reference.getQuestion().getQbQuestion().getUid())) {
+	    if (!reference.isRandomQuestion() && qbQuestionUid.equals(
+		    reference.getQuestion().getQbQuestion().getUid())) {
 		//let jsp know it's a duplicate
 		return "forward:/authoring/showDuplicateQuestionError.do";
 	    }
@@ -834,10 +835,12 @@
 	    ArrayNode questionData = JsonNodeFactory.instance.arrayNode();
 	    questionData.add(question.getUid());
 
-	    String title = question.getName() == null ? ""
+	    String title = question.getName() == null
+		    ? ""
 		    : question.getName().replaceAll("\\<.*?\\>", "").replaceAll("\\n", " ").trim();
 	    questionData.add(HtmlUtils.htmlEscape(title));
-	    String description = question.getDescription() == null ? ""
+	    String description = question.getDescription() == null
+		    ? ""
 		    : question.getDescription().replaceAll("\\<.*?\\>", "").trim();
 	    questionData.add(HtmlUtils.htmlEscape(description));
 
@@ -872,8 +875,8 @@
 		AssessmentConstants.ATTR_REFERENCES_SEQUENCE_IDS);
 	List<QuestionReference> updatedQuestionReferences = new LinkedList<>();
 	for (QuestionReference questionReference : questionReferences.toArray(new QuestionReference[0])) {
-	    String newSequenceId = sequenceIdsParamMap
-		    .get(AssessmentConstants.PARAM_SEQUENCE_ID + questionReference.getSequenceId());
+	    String newSequenceId = sequenceIdsParamMap.get(
+		    AssessmentConstants.PARAM_SEQUENCE_ID + questionReference.getSequenceId());
 
 	    questionReference.setSequenceId(Integer.valueOf(newSequenceId));
 	    updatedQuestionReferences.add(questionReference);
@@ -954,8 +957,8 @@
      */
     @SuppressWarnings("unchecked")
     private SortedSet<QuestionReference> getQuestionReferences(SessionMap<String, Object> sessionMap) {
-	SortedSet<QuestionReference> list = (SortedSet<QuestionReference>) sessionMap
-		.get(AssessmentConstants.ATTR_QUESTION_REFERENCES);
+	SortedSet<QuestionReference> list = (SortedSet<QuestionReference>) sessionMap.get(
+		AssessmentConstants.ATTR_QUESTION_REFERENCES);
 	if (list == null) {
 	    list = new TreeSet<>(new SequencableComparator());
 	    sessionMap.put(AssessmentConstants.ATTR_QUESTION_REFERENCES, list);
@@ -1012,8 +1015,8 @@
 	int count = NumberUtils.toInt(request.getParameter(AssessmentConstants.ATTR_OVERALL_FEEDBACK_COUNT));
 	TreeSet<AssessmentOverallFeedback> overallFeedbackList = new TreeSet<>(new SequencableComparator());
 	for (int i = 0; i < count; i++) {
-	    String gradeBoundaryStr = request
-		    .getParameter(AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i);
+	    String gradeBoundaryStr = request.getParameter(
+		    AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i);
 	    String feedback = request.getParameter(AssessmentConstants.ATTR_OVERALL_FEEDBACK_FEEDBACK_PREFIX + i);
 	    String sequenceId = request.getParameter(AssessmentConstants.ATTR_OVERALL_FEEDBACK_SEQUENCE_ID_PREFIX + i);
 
@@ -1055,8 +1058,8 @@
 	    AssessmentOverallFeedback overallFeedback = new AssessmentOverallFeedback();
 	    overallFeedback.setSequenceId(NumberUtils.toInt(sequenceId));
 	    if (!StringUtils.isBlank(gradeBoundaryStr)) {
-		int gradeBoundary = NumberUtils
-			.toInt(paramMap.get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i));
+		int gradeBoundary = NumberUtils.toInt(
+			paramMap.get(AssessmentConstants.ATTR_OVERALL_FEEDBACK_GRADE_BOUNDARY_PREFIX + i));
 		overallFeedback.setGradeBoundary(gradeBoundary);
 	    }
 	    overallFeedback.setFeedback(feedback);
@@ -1070,7 +1073,7 @@
      *
      * @param request
      * @param parameterName
-     *            parameterName
+     * 	parameterName
      */
     private Map<String, String> splitRequestParameter(HttpServletRequest request, String parameterName) {
 	String list = request.getParameter(parameterName);
@@ -1128,4 +1131,4 @@
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	return user != null ? user.getUserID() : null;
     }
-}
+}
\ No newline at end of file