Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6dae97d1e19f36598388f917b31545025f58a109 -r480b15c94636d9f68721a022f60bbd65b2d8b530
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6dae97d1e19f36598388f917b31545025f58a109)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 480b15c94636d9f68721a022f60bbd65b2d8b530)
@@ -332,6 +332,8 @@
 label.questions.choice.select.all = Select all
 label.questions.choice.missing = Please check at least one question.
 label.questions.choice.none.found = No questions available
+label.questions.choice.generate.more = Generate more questions
+label.questions.choice.generate.more.error = Error while generating more questions
 index.single.activity.lesson.title = Add single activity lesson
 index.single.activity.lesson.desc = or one-click activity:
 label.disable.lesson.sorting = Disable lesson sorting
Index: lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
===================================================================
diff -u -r6ef41c856ea65dbebad270baee8e9885329a5f70 -r480b15c94636d9f68721a022f60bbd65b2d8b530
--- lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java	(.../QuestionsController.java)	(revision 6ef41c856ea65dbebad270baee8e9885329a5f70)
+++ lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java	(.../QuestionsController.java)	(revision 480b15c94636d9f68721a022f60bbd65b2d8b530)
@@ -1,17 +1,5 @@
 package org.lamsfoundation.lams.web;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.qb.model.QbCollection;
 import org.lamsfoundation.lams.qb.service.IQbService;
@@ -33,6 +21,17 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
 /**
  * Runs extraction of the chosen IMS QTI zip file or .docx file. Prepares form for user to manually choose interesting
  * question.
@@ -100,6 +99,11 @@
 	    return "questions/questionFile";
 	}
 
+	String questionSourceKey = request.getParameter("questionSourceKey");
+	if (StringUtils.isNotBlank(questionSourceKey)) {
+	    request.getSession().removeAttribute("questionSourceKey");
+	}
+
 	Question[] questions = null;
 	if (isTextBasedInput) {
 	    try {
Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -r70a326811aab339193f6031102dfde367b21cc5c -r480b15c94636d9f68721a022f60bbd65b2d8b530
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 70a326811aab339193f6031102dfde367b21cc5c)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 480b15c94636d9f68721a022f60bbd65b2d8b530)
@@ -8,7 +8,9 @@
 	<lams:head>
 		<title><fmt:message key="title.lams" /> :: <fmt:message key="label.questions.choice.title" /></title>
 		<lams:css/>
-		<style type="text/css">
+		<link rel="stylesheet" href="${lams}includes/font-awesome/css/font-awesome.min.css" type="text/css" media="screen" />
+
+		<style>
 			div.answerDiv {
 				padding-left: 50px;
 				display: none;
@@ -28,11 +30,6 @@
 				display: inline;
 			}
 
-			.button {
-				float: right;
-				margin-left: 10px;
-			}
-
 			#buttonsDiv {
 				padding: 15px 0px 15px 0px;
 			}
@@ -46,13 +43,15 @@
 				margin-bottom: 30px;
 			}
 		</style>
-		<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 		<script type="text/javascript">
 			window.resizeTo(1152, 648);
 
-			var returnURL = '${returnURL}';
-			var callerID = '${callerID}';
+			let returnURL = '${returnURL}',
+					callerID = '${callerID}',
+					questionsContainer = null,
+					questionTemplate = null;
 
 			function submitForm() {
 				var anyQuestionsSelected = false;
@@ -91,13 +90,126 @@
 
 			}
 
+			<c:if test="${not empty param.questionSourceKey and not empty questions}">
+			function generateQuestions() {
+				$('#generateQuestionsButton').prop('disabled', true).button('loading');
+
+				// questionSourceKey comes from the initial request from the form
+				$.ajax({
+					'url': '${lams}ai/authoring/ratMcqJsonFromSource.do',
+					'type': 'post',
+					'dataType': 'json',
+					'data': {
+						'questionSourceKey': '${param.questionSourceKey}',
+					},
+					'complete' : function(){
+						$('#generateQuestionsButton').prop('disabled', false).button('reset');
+					},
+					'error' : function () {
+						alert('<fmt:message key="label.questions.choice.generate.more.error" />');
+					},
+					'success': function (questions) {
+						let questionCount = +$('#questionCount').val();
+
+						$('#selectAll').attr('checked', false);
+
+						$('#questionCount').val(questionCount + questions.length);
+						questionTemplate.find('.questionResourcesFolder').remove();
+
+						// parse question in JSON format and add them to the page
+						$.each(questions, function (iterationIndex, question) {
+							let questionContainer = questionTemplate.clone().appendTo(questionsContainer),
+									questionIndex = questionCount + iterationIndex + 1;
+
+							questionContainer.find('.questionCheckbox').attr('data-question-index', questionIndex)
+									.attr('id', 'question' + questionIndex + 'checkbox');
+							questionContainer.find('.questionTitleDisplay')
+									.text(questionIndex + '. (<fmt:message key="label.questions.choice.type.mc" />)');
+							questionContainer.find('.editableQuestionTitle').attr('id', 'question' + questionIndex)
+									.attr('name', 'question' + questionIndex).attr('value', question.title)
+									.val(question.title);
+							questionContainer.find('.questionType').attr('id', 'question' + questionIndex + 'type')
+									.attr('name', 'question' + questionIndex + 'type')
+									.val('mc');
+
+							if (question.label) {
+								questionContainer.find('.questionLabel').attr('id', 'question' + questionIndex + 'label')
+										.attr('name', 'question' + questionIndex + 'label')
+										.val(question.label);
+							}
+
+							if (question.text) {
+								questionContainer.find('.questionText').attr('id', 'question' + questionIndex + 'text')
+										.attr('name', 'question' + questionIndex + 'text')
+										.val(question.text);
+								questionContainer.find('.questionTextDisplay').html(question.text);
+							} else {
+								questionContainer.find('.questionText').remove();
+							}
+
+							if (question.score) {
+								questionContainer.find('.questionScore').attr('id', 'question' + questionIndex + 'score')
+										.attr('name', 'question' + questionIndex + 'score')
+										.val(question.score);
+							} else {
+								questionContainer.find('.questionScore').remove();
+							}
+
+							if (question.feedback) {
+								questionContainer.find('.questionFeedback').attr('id', 'question' + questionIndex + 'feedback')
+										.attr('name', 'question' + questionIndex + 'feedback')
+										.val(question.feedback);
+							} else {
+								questionContainer.find('.questionFeedback').remove();
+							}
+
+							let answersDiv = questionContainer.find('.answerDiv');
+							if (question.answers) {
+								answersDiv.attr('id', 'question' + questionIndex + 'answerDiv')
+										.find('.answerCount')
+										.attr('name', 'answerCount' + questionIndex)
+										.val(question.answers.length);
+								let answerTemplate = answersDiv.find('.answerContainer').first().clone();
+								answerTemplate.find('.answerCorrect').remove();
+								answersDiv.find('.answerContainer').remove();
+
+								$.each(question.answers, function (answerIndex, answer) {
+									let answerContainer = answerTemplate.clone().appendTo(answersDiv),
+											answerText = answerContainer.find('.answerText')
+													.attr('name', 'question' + questionIndex + 'answer' + answerIndex).attr('value', answer.text)
+													.val(answer.text);
+									if (answer.score == 1) {
+										$('<span class="answerCorrect" />').text(' (<fmt:message key="label.correct"/>)').insertAfter(answerText);
+									}
+									answerContainer.find('.answerScore').attr('name', 'question' + questionIndex + 'answer' + answerIndex + 'score')
+											.val(answer.score);
+									if (answer.feedback) {
+										answerContainer.find('.answerFeedback')
+												.attr('name', 'question' + questionIndex + 'answer' + answerIndex + 'feedback')
+												.val(answer.feedback);
+									}
+									answersDiv.append(answerContainer);
+								});
+							} else {
+								answersDiv.remove();
+							}
+						});
+					}
+				});
+			}
+			</c:if>
+
 			$(document).ready(function(){
-				$('.questionCheckbox').change(function(){
+				questionsContainer = $('#questionsContainer');
+				questionTemplate = $('.questionContainer').first().clone();
+
+				$('#questionsContainer').on('change', '.questionCheckbox', function(){
 					var checked = $(this).is(':checked'),
 							selector = '#question' + $(this).data('questionIndex'),
 							answerDiv = $(selector + 'answerDiv'),
 							answersVisible = answerDiv.find('.answerVisible').length > 0;
 
+
 					$(this).attr('checked', checked);
 					// enable/disable answers and feedback fields
 					// so they do not get posted when not needed
@@ -212,7 +324,8 @@
 				</lams:Alert>
 
 				<form id="questionForm" method="POST" class="form-inline">
-					<input type="hidden" name="questionCount" value="${fn:length(questions)}" />
+					<input id="questionCount" type="hidden" name="questionCount" value="${fn:length(questions)}" />
+					<input type="hidden" name="questionSourceKey" value="${param.questionSourceKey}" />
 
 					<c:if test="${not empty collections}">
 						<!-- Choose a collection where questions should be imported to -->
@@ -238,128 +351,143 @@
 						</label>
 					</div>
 
-					<c:forEach var="question" items="${questions}" varStatus="questionStatus">
-						<c:set var="questionEditable" value="${editingEnabled and (question.type eq 'mc' or question.type eq 'mr')}" />
-						<c:set var="questionTypeLabel">label.questions.choice.type.${question.type}</c:set>
+					<div id="questionsContainer">
+						<c:forEach var="question" items="${questions}" varStatus="questionStatus">
+							<c:set var="questionEditable" value="${editingEnabled and (question.type eq 'mc' or question.type eq 'mr')}" />
+							<c:set var="questionTypeLabel">label.questions.choice.type.${question.type}</c:set>
 
-						<%-- Question itself --%>
-						<div class="checkbox">
-							<label>
-								<input id="question${questionStatus.index}checkbox"
-									   data-question-index="${questionStatus.index}" class="questionCheckbox" type="checkbox" />
-									${questionStatus.index + 1}. (<fmt:message key="${questionTypeLabel}" />)
-								<c:choose>
-								<c:when test="${questionEditable}">
-							</label>
-							<input id="question${questionStatus.index}" name="question${questionStatus.index}"
-								   value="<c:out value='${question.title}' />"
-								   class="questionAttribute editableAttribute form-control"
-								   type="text" disabled="disabled" />
-							</c:when>
-							<c:otherwise>
-								<c:out value='${question.title}' />
-								</label>
-								<input id="question${questionStatus.index}" name="question${questionStatus.index}"
-									   value="<c:out value='${question.title}' />" class="questionAttribute" type="hidden" />
-							</c:otherwise>
-							</c:choose>
-						</div>
+							<div class="questionContainer">
+									<%-- Question itself --%>
+								<div class="checkbox">
+									<label>
+										<input id="question${questionStatus.index}checkbox"
+											   data-question-index="${questionStatus.index}" class="questionCheckbox" type="checkbox" />
+										<span class="questionTitleDisplay">${questionStatus.index + 1}. (<fmt:message key="${questionTypeLabel}" />)</span>
+										<c:choose>
+										<c:when test="${questionEditable}">
+									</label>
+									<input id="question${questionStatus.index}" name="question${questionStatus.index}"
+										   value="<c:out value='${question.title}' />"
+										   class="questionAttribute editableAttribute editableQuestionTitle form-control"
+										   type="text" disabled="disabled" />
+									</c:when>
+									<c:otherwise>
+										<c:out value='${question.title}' />
+										</label>
+										<input id="question${questionStatus.index}" name="question${questionStatus.index}"
+											   value="<c:out value='${question.title}' />" class="questionAttribute" type="hidden" />
+									</c:otherwise>
+									</c:choose>
+								</div>
 
-						<input id="question${questionStatus.index}label" name="question${questionStatus.index}label"
-							   value="<c:out value='${question.label}' />"
-							   class="questionAttribute" type="hidden" />
+								<input id="question${questionStatus.index}label" name="question${questionStatus.index}label"
+									   value="<c:out value='${question.label}' />"
+									   class="questionAttribute questionLabel" type="hidden" />
 
-						<input id="question${questionStatus.index}text" name="question${questionStatus.index}text"
-							   value="<c:out value='${question.text}' />"
-							   class="questionAttribute" type="hidden" disabled="disabled" />
-						<div class="questionText">${question.text}</div>
-						<input type="hidden" id="question${questionStatus.index}type" name="question${questionStatus.index}type"
-							   value="${question.type}"
-							   class="questionAttribute" disabled="disabled" />
+								<input id="question${questionStatus.index}text" name="question${questionStatus.index}text"
+									   value="<c:out value='${question.text}' />"
+									   class="questionAttribute questionText" type="hidden" disabled="disabled" />
+								<div class="questionTextDisplay">${question.text}</div>
+								<input type="hidden" id="question${questionStatus.index}type" name="question${questionStatus.index}type"
+									   value="${question.type}"
+									   class="questionAttribute questionType" disabled="disabled" />
 
-						<c:if test="${not empty question.score}">
-							<input type="hidden" id="question${questionStatus.index}score" name="question${questionStatus.index}score"
-								   value="${question.score}"
-								   class="questionAttribute" disabled="disabled" />
-						</c:if>
-						<%-- Question feedback --%>
-						<input type="hidden" id="question${questionStatus.index}feedback" name="question${questionStatus.index}feedback"
-							   value="<c:out value='${question.feedback}' />"
-							   class="questionAttribute" disabled="disabled" />
-						<%-- If question contains images, where to take them from --%>
-						<input type="hidden" id="question${questionStatus.index}resourcesFolder"
-							   name="question${questionStatus.index}resourcesFolder"
-							   value="<c:out value='${question.resourcesFolderPath}' />"
-							   class="questionAttribute" disabled="disabled" />
-						<%-- Answers, if required and exist --%>
-						<c:if test="${fn:length(question.answers) > 0}">
-							<div id="question${questionStatus.index}answerDiv" class="answerDiv">
-								<input type="hidden" name="answerCount${questionStatus.index}"
-									   value="${fn:length(question.answers)}" />
-								<c:forEach var="answer" items="${question.answers}" varStatus="answerStatus">
-									<%-- Answer itself --%>
-									<c:choose>
-										<c:when test="${questionEditable}">
-											<div class="form-group">
-												<input name="question${questionStatus.index}answer${answerStatus.index}"
-													   value="<c:out value='${answer.text}' />" class="answerVisible editableAttribute form-control"
-													   type="text" disabled="disabled" />
-												<c:if test="${answer.score == 1}">(<fmt:message key="label.correct"/>)</c:if>
+								<c:if test="${not empty question.score}">
+									<input type="hidden" id="question${questionStatus.index}score" name="question${questionStatus.index}score"
+										   value="${question.score}"
+										   class="questionAttribute questionScore" disabled="disabled" />
+								</c:if>
+									<%-- Question feedback --%>
+								<input type="hidden" id="question${questionStatus.index}feedback" name="question${questionStatus.index}feedback"
+									   value="<c:out value='${question.feedback}' />"
+									   class="questionAttribute questionFeedback" disabled="disabled" />
+									<%-- If question contains images, where to take them from --%>
+								<input type="hidden" id="question${questionStatus.index}resourcesFolder"
+									   name="question${questionStatus.index}resourcesFolder"
+									   value="<c:out value='${question.resourcesFolderPath}' />"
+									   class="questionAttribute questionResourcesFolder" disabled="disabled" />
+									<%-- Answers, if required and exist --%>
+								<c:if test="${fn:length(question.answers) > 0}">
+									<div id="question${questionStatus.index}answerDiv" class="answerDiv">
+										<input type="hidden" name="answerCount${questionStatus.index}"
+											   value="${fn:length(question.answers)}" class="answerCount" />
+										<c:forEach var="answer" items="${question.answers}" varStatus="answerStatus">
+											<div class="answerContainer">
+													<%-- Answer itself --%>
+												<c:choose>
+													<c:when test="${questionEditable}">
+														<div class="form-group">
+															<input name="question${questionStatus.index}answer${answerStatus.index}"
+																   value="<c:out value='${answer.text}' />" class="answerText answerVisible editableAttribute form-control"
+																   type="text" disabled="disabled" />
+															<c:if test="${answer.score == 1}"><span class="answerCorrect">(<fmt:message key="label.correct"/>)</span></c:if>
+														</div>
+													</c:when>
+													<c:when test="${question.type eq 'mc' or question.type eq 'mr' or question.type eq 'mh' or question.type eq 'fb'}">
+														<input name="question${questionStatus.index}answer${answerStatus.index}"
+															   value="<c:out value='${answer.text}' />" class="answerVisible"
+															   type="hidden" disabled="disabled" />
+														<c:if test="${answer.score == 1}"><b></c:if>
+														- ${answer.text}
+														<c:if test="${answer.score == 1}">&nbsp;(<fmt:message key="label.correct"/>)</b></c:if>
+														<br />
+													</c:when>
+													<c:otherwise>
+														<%-- Do not display answers if management is too difficult or pointless --%>
+														<input name="question${questionStatus.index}answer${answerStatus.index}"
+															   value="<c:out value='${answer.text}' />"
+															   type="hidden" disabled="disabled" />
+													</c:otherwise>
+												</c:choose>
+													<%-- Answers score and feedback --%>
+												<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}score"
+													   class="answerScore" value="${answer.score}" disabled="disabled" />
+												<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}feedback"
+													   class="answerFeedback" value="<c:out value='${answer.feedback}' />" disabled="disabled" />
 											</div>
-										</c:when>
-										<c:when test="${question.type eq 'mc' or question.type eq 'mr' or question.type eq 'mh' or question.type eq 'fb'}">
-											<input name="question${questionStatus.index}answer${answerStatus.index}"
-												   value="<c:out value='${answer.text}' />" class="answerVisible"
-												   type="hidden" disabled="disabled" />
-											<c:if test="${answer.score == 1}"><b></c:if>
-											- ${answer.text}
-											<c:if test="${answer.score == 1}">&nbsp;(<fmt:message key="label.correct"/>)</b></c:if>
-											<br />
-										</c:when>
-										<c:otherwise>
-											<%-- Do not display answers if management is too difficult or pointless --%>
-											<input name="question${questionStatus.index}answer${answerStatus.index}"
-												   value="<c:out value='${answer.text}' />"
-												   type="hidden" disabled="disabled" />
-										</c:otherwise>
-									</c:choose>
-									<%-- Answers score and feedback --%>
-									<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}score"
-										   value="${answer.score}" disabled="disabled" />
-									<input type="hidden" name="question${questionStatus.index}answer${answerStatus.index}feedback"
-										   value="<c:out value='${answer.feedback}' />" disabled="disabled" />
-								</c:forEach>
-								<c:if test="${question.type eq 'mt'}">
-									<input type="hidden" name="matchAnswerCount${questionStatus.index}"
-										   value="${fn:length(question.matchAnswers)}" />
-									<c:forEach var="matchAnswer" items="${question.matchAnswers}" varStatus="matchAnswerStatus">
-										<input name="question${questionStatus.index}matchAnswer${matchAnswerStatus.index}"
-											   value="<c:out value='${matchAnswer.text}' />"
-											   type="hidden" disabled="disabled" />
+										</c:forEach>
+										<c:if test="${question.type eq 'mt'}">
+											<input type="hidden" name="matchAnswerCount${questionStatus.index}"
+												   value="${fn:length(question.matchAnswers)}" />
+											<c:forEach var="matchAnswer" items="${question.matchAnswers}" varStatus="matchAnswerStatus">
+												<input name="question${questionStatus.index}matchAnswer${matchAnswerStatus.index}"
+													   value="<c:out value='${matchAnswer.text}' />"
+													   type="hidden" disabled="disabled" />
+											</c:forEach>
+											<c:forEach var="entry" items="${question.matchMap}">
+												<input name="question${questionStatus.index}match${entry.key}"
+													   value="${entry.value}"
+													   type="hidden" disabled="disabled" />
+											</c:forEach>
+										</c:if>
+									</div>
+								</c:if>
+
+									<%-- Learning Outcomes, if required and exist --%>
+								<c:if test="${fn:length(question.learningOutcomes) > 0}">
+									<input type="hidden" name="learningOutcomeCount${questionStatus.index}"
+										   value="${fn:length(question.learningOutcomes)}" />
+									<c:forEach var="learningOutcome" items="${question.learningOutcomes}" varStatus="learningOutcomeStatus">
+										<input name="question${questionStatus.index}learningOutcome${learningOutcomeStatus.index}"
+											   value="<c:out value='${learningOutcome}'/>" type="hidden" />
 									</c:forEach>
-									<c:forEach var="entry" items="${question.matchMap}">
-										<input name="question${questionStatus.index}match${entry.key}"
-											   value="${entry.value}"
-											   type="hidden" disabled="disabled" />
-									</c:forEach>
 								</c:if>
 							</div>
-						</c:if>
+						</c:forEach>
+					</div>
 
-						<%-- Learning Outcomes, if required and exist --%>
-						<c:if test="${fn:length(question.learningOutcomes) > 0}">
-							<input type="hidden" name="learningOutcomeCount${questionStatus.index}"
-								   value="${fn:length(question.learningOutcomes)}" />
-							<c:forEach var="learningOutcome" items="${question.learningOutcomes}" varStatus="learningOutcomeStatus">
-								<input name="question${questionStatus.index}learningOutcome${learningOutcomeStatus.index}"
-									   value="<c:out value='${learningOutcome}'/>" type="hidden" />
-							</c:forEach>
+
+					<div id="buttonsDiv" class="voffset10">
+						<c:if test="${not empty param.questionSourceKey and not empty questions}">
+							<button id="generateQuestionsButton" class="btn btn-primary" type="button"
+									data-loading-text="<i class='fa fa-circle-o-notch fa-spin'></i><span> <fmt:message key="label.questions.choice.generate.more" /></span>"
+									onClick="javascript:generateQuestions()">
+								<fmt:message key="label.questions.choice.generate.more"/>
+							</button>
 						</c:if>
-					</c:forEach>
 
-					<div id="buttonsDiv" class="voffset10 pull-right">
-						<input class="btn btn-default" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />
-						<input id="submitButton" class="btn btn-primary" value='<fmt:message key="label.ok"/>' type="button" onClick="javascript:submitForm()" />
+						<input id="submitButton" class="btn btn-primary loffset10 pull-right" value='<fmt:message key="label.ok"/>' type="button" onClick="javascript:submitForm()" />
+						<input class="btn btn-default pull-right" value='<fmt:message key="button.cancel"/>' type="button" onClick="javascript:window.close()" />
 					</div>
 				</form>
 			</c:otherwise>