Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -r8bc318f44b193b1d926fcc62211ca1b4b18d9b30 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 8bc318f44b193b1d926fcc62211ca1b4b18d9b30)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -11,7 +11,7 @@
     	<archive path="/lams_build/lib/apache-tika/tika-parsers-1.24.jar"/>
         <archive path="/lams_build/lib/autopatch/autopatch-1.4.2-lams.jar"/>
         <archive path="/lams_build/lib/autopatch/discovery-1.0.5-lams.jar"/>
-        <archive path="/lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar"/>
+        <archive path="/lams_build/lib/basiclti-util/basiclti-util-1.2.0.jar" source="/3rdParty_sources/basiclti-util/src/main/java"/>
         <archive path="/lams_build/lib/basiclti-util/oauth-20100527.jar"/>
         <archive path="/lams_build/lib/basiclti-util/oauth-provider-20100527.jar"/>
         <archive path="/lams_build/lib/basiclti-util/signpost-commonshttp4-1.2.1.2.jar"/>
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -321,7 +321,7 @@
 label.tab.conditions.timelimit.individual = Is this time limit for each individual?
 label.tab.conditions.enable = Enable
 label.questions.file.title = Choose IMS QTI file
-label.questions.file.missing = Please select a ZIP or XML file with questions in IMS QTIformat.
+label.questions.file.missing = Please select an MS Word (.docx), ZIP or XML file with the questions to import.
 label.questions.choice.title = Choose questions
 label.questions.choice.select.all = Select all
 label.questions.choice.missing = Please check at least one question.
@@ -977,7 +977,7 @@
 label.qb.collection.private = Private collection
 label.qb.collection.remove = Remove collection
 label.qb.collection.xml = XML
-label.qb.collection.qti = QTI
+label.qb.collection.qti = IMS QTI
 label.qb.collection.questions.none = There are no questions in this collection
 label.qb.collection.share.title = Share collection with courses
 label.qb.collection.shared = Shared
@@ -1053,9 +1053,10 @@
 label.authoring.basic.none = None
 error.positive.grade.required = One of the answers should have a positive grade
 label.do.you.want.to.delete.answer = Do you want to delete this answer?
-label.choose.word.document = Choose Word file
-label.import.word = Import questions from Word document
-label.qb.collection.word = Word
+label.choose.word.document = Choose Microsoft Word file
+label.import.word = Import questions from Microsoft Word document
+# Microsoft Word
+label.qb.collection.word = MS Word
 authoring.fla.page.prop.gate.type.password = Password
 authoring.fla.page.prop.password = Password
 label.question.bank = Question Bank
@@ -1073,7 +1074,9 @@
 label.authoring.feeback.correct = Feedback on any correct response
 label.authoring.feeback.partially.correct = Feedback on any partially correct response
 label.authoring.feeback.incorrect = Feedback on any incorrect response
-
-label.choose.word.document  =Choose Word file
-label.import.word  =Import questions from Word document
-label.qb.collection.word  =Word
\ No newline at end of file
+error.ld.zip.file = Only zip files allowed
+# MS Word file template for importing questions into LAMS
+label.download.word.template = Download Microsoft Word template
+authoring.tbl.import.questions.from = Import questions from
+button.save.new.version = Save as new version
+authoring.fla.replace.question.prompt = The question you updated is present in other activities in this learning design. Do you want to update this question also in [0]?
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -41,6 +41,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.authoring.service.AuthoringService;
 import org.lamsfoundation.lams.authoring.service.IAuthoringFullService;
 import org.lamsfoundation.lams.authoring.template.AssessMCAnswer;
 import org.lamsfoundation.lams.authoring.template.Assessment;
@@ -58,10 +59,8 @@
 import org.lamsfoundation.lams.questions.Question;
 import org.lamsfoundation.lams.questions.QuestionParser;
 import org.lamsfoundation.lams.rest.RestTags;
-import org.lamsfoundation.lams.rest.ToolRestManager;
 import org.lamsfoundation.lams.tool.Tool;
 import org.lamsfoundation.lams.tool.dao.IToolDAO;
-import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.AuthoringJsonTags;
@@ -662,29 +661,6 @@
 	return activityJSON;
     }
 
-    /* ************************************** Tool related methods ********************************************** */
-    /** General method to create a tool content. All calls to create tool content should go through this method */
-    protected Long createToolContent(UserDTO user, String toolSignature, ObjectNode toolContentJSON)
-	    throws IOException {
-	try {
-	    Tool tool = getTool(toolSignature);
-	    Long toolContentID = authoringService.insertToolContentID(tool.getToolId());
-
-	    // Tools' services implement an interface for processing REST requests
-	    ToolRestManager toolRestService = (ToolRestManager) lamsCoreToolService.findToolService(tool);
-	    toolRestService.createRestToolContent(user.getUserID(), toolContentID, toolContentJSON);
-
-	    return toolContentID;
-	} catch (Exception e) {
-	    log.error("Unable to create tool content for " + toolSignature + " with details " + toolContentJSON
-		    + ". \nThe tool probably threw an exception - check the server logs for more details.\n"
-		    + "If the exception is \"Servlet.service() for servlet ToolContentRestServlet threw exception java.lang.ClassCastException: com.sun.proxy.$ProxyXXX cannot be cast to org.lamsfoundation.lams.rest.ToolRestManager)\""
-		    + " then the tool doesn't support the LDTemplate service calls (ie has not implemented the ToolRestManager interface / createRestToolContent() method.");
-	    throw new ToolException(
-		    "Unable to create tool content for " + toolSignature + " with details " + toolContentJSON);
-	}
-    }
-
     /**
      * General method to create tool activity. All calls to create an activity relating to a tool should go through this
      * method
@@ -732,87 +708,7 @@
 	return activityJSON;
     }
 
-    /** Sets up the standard fields that are used by many tools! */
-    protected ObjectNode createStandardToolContent(String title, String instructions, String reflectionInstructions,
-	    Boolean lockWhenFinished, Boolean allowRichTextEditor, UserDTO user) {
-	ObjectNode toolContentJSON = JsonNodeFactory.instance.objectNode();
-	toolContentJSON.put(RestTags.TITLE, title != null ? title : "");
-	toolContentJSON.put(RestTags.INSTRUCTIONS, instructions != null ? instructions : "");
-
-	if (reflectionInstructions != null) {
-	    toolContentJSON.put(RestTags.REFLECT_ON_ACTIVITY, true);
-	    toolContentJSON.put(RestTags.REFLECT_INSTRUCTIONS, reflectionInstructions);
-	}
-
-	toolContentJSON.put(RestTags.LOCK_WHEN_FINISHED, lockWhenFinished);
-	toolContentJSON.put(RestTags.ALLOW_RICH_TEXT_EDITOR, allowRichTextEditor);
-
-	if (user != null) {
-	    toolContentJSON.put("firstName", user.getFirstName());
-	    toolContentJSON.put("lastName", user.getLastName());
-	    toolContentJSON.put("loginName", user.getLogin());
-	}
-	return toolContentJSON;
-    }
-
     /**
-     * Helper method to create a Assessment tool content. Assessment is one of the unusuals tool in that it caches
-     * user's login names and
-     * first/last names Mandatory fields in toolContentJSON: title, instructions, resources, user fields firstName,
-     * lastName and loginName.
-     *
-     * Required fields in toolContentJSON: "title", "instructions", "questions", "firstName", "lastName", "lastName",
-     * "questions" and "references".
-     *
-     * The questions entry should be ArrayNode containing JSON objects, which in turn must contain
-     * "questionTitle", "questionText", "displayOrder" (Integer), "type" (Integer). If the type is Multiple Choice,
-     * Numerical or Matching Pairs
-     * then a ArrayNode "answers" is required.
-     *
-     * The answers entry should be ArrayNode
-     * containing JSON objects, which in turn must contain "answerText" or "answerFloat", "displayOrder" (Integer),
-     * "grade" (Integer).
-     *
-     * For the templates, all the questions that are created will be set up as references, therefore the questions in
-     * the assessment == the bank of questions.
-     * So references entry will be a ArrayNode containing JSON objects, which in turn must contain "displayOrder"
-     * (Integer),
-     * "questionDisplayOrder" (Integer - to match to the question). If default grade or random questions are needed then
-     * this method needs
-     * to be expanded.
-     */
-    protected Long createAssessmentToolContent(UserDTO user, String title, String instructions,
-	    String reflectionInstructions, boolean selectLeaderToolOutput, boolean enableNumbering,
-	    boolean enableConfidenceLevels, boolean allowDiscloseAnswers, boolean allowAnswerJustification,
-	    ArrayNode questions) throws IOException {
-
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions, null, null,
-		user);
-	toolContentJSON.put(RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, selectLeaderToolOutput);
-	toolContentJSON.put(RestTags.ENABLE_CONFIDENCE_LEVELS, enableConfidenceLevels);
-	toolContentJSON.put("numbered", enableNumbering);
-	toolContentJSON.put("displaySummary", Boolean.TRUE);
-	toolContentJSON.put("allowDiscloseAnswers", allowDiscloseAnswers);
-	toolContentJSON.put("allowAnswerJustification", allowAnswerJustification);
-
-	toolContentJSON.set(RestTags.QUESTIONS, questions);
-
-	ArrayNode references = JsonNodeFactory.instance.arrayNode();
-	for (int i = 0; i < questions.size(); i++) {
-	    ObjectNode question = (ObjectNode) questions.get(i);
-	    question.put("answerRequired", true);
-
-	    Integer questionDisplayOrder = question.get(RestTags.DISPLAY_ORDER).asInt();
-	    Integer defaultGrade = JsonUtil.optInt(question, "defaultGrade", 1);
-	    references.add(JsonNodeFactory.instance.objectNode().put(RestTags.DISPLAY_ORDER, questionDisplayOrder)
-		    .put("questionDisplayOrder", questionDisplayOrder).put("defaultGrade", defaultGrade));
-	}
-	toolContentJSON.set("references", references);
-
-	return createToolContent(user, LdTemplateController.ASSESSMENT_TOOL_SIGNATURE, toolContentJSON);
-    }
-
-    /**
      * Creates a forum activity's JSON details.
      */
     protected ObjectNode createAssessmentActivity(AtomicInteger uiid, int order, Integer[] layoutCoords,
@@ -833,10 +729,10 @@
     protected Long createChatToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
 	    String filterKeywords, String reflectionInstructions) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
-		lockWhenFinished, null, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions,
+		reflectionInstructions, lockWhenFinished, null, null);
 	toolContentJSON.put("filterKeywords", filterKeywords);
-	return createToolContent(user, LdTemplateController.CHAT_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.CHAT_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -872,8 +768,8 @@
 	    boolean allowRichTextEditor, boolean allowNewTopic, boolean allowRateMessages, boolean allowUpload,
 	    boolean limitedMaxCharacters, Integer maxCharacters, ArrayNode topics) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished,
-		allowRichTextEditor, user);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null,
+		lockWhenFinished, allowRichTextEditor, user);
 	toolContentJSON.set("topics", topics);
 	toolContentJSON.put("allowNewTopic", allowNewTopic);
 	toolContentJSON.put("allowRateMessages", allowRateMessages);
@@ -882,7 +778,7 @@
 	if (limitedMaxCharacters && maxCharacters != null) {
 	    toolContentJSON.put("maxCharacters", maxCharacters);
 	}
-	return createToolContent(user, LdTemplateController.FORUM_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.FORUM_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -903,8 +799,9 @@
      */
     protected Long createLeaderSelectionToolContent(UserDTO user, String title, String instructions)
 	    throws IOException {
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
-	return createToolContent(user, LdTemplateController.LEADER_TOOL_SIGNATURE, toolContentJSON);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null, null, null,
+		null);
+	return authoringService.createToolContent(user, LdTemplateController.LEADER_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -926,9 +823,9 @@
     protected Long createNotebookToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
 	    boolean allowRichTextEditor) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished,
-		allowRichTextEditor, null);
-	return createToolContent(user, LdTemplateController.NOTEBOOK_TOOL_SIGNATURE, toolContentJSON);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null,
+		lockWhenFinished, allowRichTextEditor, null);
+	return authoringService.createToolContent(user, LdTemplateController.NOTEBOOK_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -950,9 +847,11 @@
     protected Long createNoticeboardToolContent(UserDTO user, String title, String content,
 	    String reflectionInstructions) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, null, reflectionInstructions, null, null, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, null, reflectionInstructions,
+		null, null, null);
 	toolContentJSON.put("content", content != null ? content : "");
-	return createToolContent(user, LdTemplateController.NOTICEBOARD_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.NOTICEBOARD_TOOL_SIGNATURE,
+		toolContentJSON);
     }
 
     /**
@@ -975,13 +874,13 @@
 	    boolean allowRichTextEditor, boolean oneQuestionPerPage, boolean showOtherLearnersAnswers,
 	    boolean showOtherLearnersNames, ArrayNode questions) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished,
-		allowRichTextEditor, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null,
+		lockWhenFinished, allowRichTextEditor, null);
 	toolContentJSON.set(RestTags.QUESTIONS, questions);
 	toolContentJSON.put("questionsSequenced", oneQuestionPerPage);
 	toolContentJSON.put("showOtherAnswers", showOtherLearnersAnswers);
 	toolContentJSON.put("usernameVisible", showOtherLearnersNames);
-	return createToolContent(user, LdTemplateController.QA_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.QA_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1002,9 +901,10 @@
     protected Long createMindmapToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
 	    boolean multiUserMode, String reflectionInstruction) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished, null, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null,
+		lockWhenFinished, null, null);
 	toolContentJSON.put("multiUserMode", multiUserMode);
-	return createToolContent(user, LdTemplateController.MINDMAP_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.MINDMAP_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1031,8 +931,8 @@
 	    boolean notifyInstructors, Integer minResourcesToView, String reflectionInstructions, ArrayNode resources)
 	    throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
-		lockWhenFinished, null, user);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions,
+		reflectionInstructions, lockWhenFinished, null, user);
 	toolContentJSON.put("allowAddFiles", allowLearnerAddFile);
 	toolContentJSON.put("allowAddUrls", allowLearnerAddURL);
 	toolContentJSON.put("notifyTeachersOnAssigmentSumbit", notifyInstructors);
@@ -1041,7 +941,8 @@
 	    toolContentJSON.put("minViewResourceNumber", minResourcesToView);
 	}
 	toolContentJSON.set("resources", resources);
-	return createToolContent(user, LdTemplateController.SHARE_RESOURCES_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.SHARE_RESOURCES_TOOL_SIGNATURE,
+		toolContentJSON);
     }
 
     // resource type - copied from ResourceConstants
@@ -1125,7 +1026,8 @@
 	    boolean useSelectLeaderToolOuput, Integer confidenceLevelsActivityUiid, ArrayNode questions)
 	    throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null, null, null,
+		null);
 	toolContentJSON.set(RestTags.QUESTIONS, questions);
 	if (confidenceLevelsActivityUiid != null) {
 	    toolContentJSON.put(RestTags.CONFIDENCE_LEVELS_ACTIVITY_UIID, confidenceLevelsActivityUiid);
@@ -1136,7 +1038,7 @@
 	    question.put("answerRequired", true);
 	}
 
-	return createToolContent(user, LdTemplateController.SCRATCHIE_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.SCRATCHIE_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1160,12 +1062,12 @@
 	    boolean autoSelectScribe, boolean showAggregatedReports, String reflectionInstructions, ArrayNode questions)
 	    throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
-		lockWhenFinished, null, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions,
+		reflectionInstructions, lockWhenFinished, null, null);
 	toolContentJSON.set(RestTags.QUESTIONS, questions);
 	toolContentJSON.put("autoSelectScribe", autoSelectScribe);
 	toolContentJSON.put("showAggregatedReports", showAggregatedReports);
-	return createToolContent(user, LdTemplateController.SCRIBE_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.SCRIBE_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1188,13 +1090,13 @@
     protected Long createSubmitToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
 	    Boolean limitUpload, Integer limitUploadNumber, String reflectionInstructions) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions,
-		lockWhenFinished, null, user);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions,
+		reflectionInstructions, lockWhenFinished, null, user);
 	if (limitUploadNumber != null) {
 	    toolContentJSON.put("limitUpload", limitUpload != null ? limitUpload : true);
 	    toolContentJSON.put("limitUploadNumber", limitUploadNumber);
 	}
-	return createToolContent(user, LdTemplateController.SUBMIT_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.SUBMIT_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1216,9 +1118,10 @@
     protected Long createSurveyToolContent(UserDTO user, String title, String instructions, Boolean lockWhenFinished,
 	    ArrayNode questions) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished, null, user);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null,
+		lockWhenFinished, null, user);
 	toolContentJSON.set("questions", questions);
-	return createToolContent(user, LdTemplateController.SURVEY_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.SURVEY_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1240,10 +1143,11 @@
     protected Long createVoteToolContent(UserDTO user, String title, String instructions, ArrayNode answers,
 	    Boolean showResults) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, null, null, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null, null, null,
+		null);
 	toolContentJSON.set(RestTags.ANSWERS, answers);
 	toolContentJSON.put("showResults", showResults);
-	return createToolContent(user, LdTemplateController.VOTE_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.VOTE_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1264,9 +1168,10 @@
     protected Long createWikiToolContent(UserDTO user, String title, String instructions, boolean lockWhenFinished,
 	    String reflectionInstruction, ArrayNode pages) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, null, lockWhenFinished, null, null);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions, null,
+		lockWhenFinished, null, null);
 	toolContentJSON.set("pages", pages);
-	return createToolContent(user, LdTemplateController.WIKI_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.WIKI_TOOL_SIGNATURE, toolContentJSON);
     }
 
     /**
@@ -1291,10 +1196,11 @@
     protected Long createPeerReviewToolContent(UserDTO user, String title, String instructions,
 	    String reflectionInstructions, ArrayNode criterias) throws IOException {
 
-	ObjectNode toolContentJSON = createStandardToolContent(title, instructions, reflectionInstructions, null, null,
-		user);
+	ObjectNode toolContentJSON = AuthoringService.createStandardToolContent(title, instructions,
+		reflectionInstructions, null, null, user);
 	toolContentJSON.set("criterias", criterias);
-	return createToolContent(user, LdTemplateController.PEER_REVIEW_TOOL_SIGNATURE, toolContentJSON);
+	return authoringService.createToolContent(user, LdTemplateController.PEER_REVIEW_TOOL_SIGNATURE,
+		toolContentJSON);
     }
 
     /**
@@ -1523,6 +1429,8 @@
 	    }
 
 	    assessment.setDefaultGrade(defaultGrade);
+
+	    assessment.setLearningOutcomes(question.getLearningOutcomes());
 	}
 
 	return assessments;
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
===================================================================
diff -u -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java	(.../SearchQBController.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -223,8 +223,7 @@
 	boolean isScratchie = WebUtil.readBooleanParam(request, "isScratchie", false);
 	request.setAttribute("isScratchie", isScratchie);
 
-	List<QbQuestion> otherVersions = qbService.getQuestionsByQuestionId(qbQuestion.getQuestionId());
-	request.setAttribute("otherVersions", otherVersions);
+	qbService.fillVersionMap(qbQuestion);
 
 	return "qb/qbQuestionDetails";
     }
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -rad1ff0d36bbc9744c0e0e61aec07c9360faee906 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision ad1ff0d36bbc9744c0e0e61aec07c9360faee906)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -1500,38 +1500,16 @@
 		});
 	},
 	
-
+	
 	/**
 	 * Open separate window with activity authoring on double click.
 	 */
 	openActivityAuthoring : function(activity){
-		// fetch authoring URL for a Tool Activity
-		if (!activity.authorURL && activity.toolID) {
-			$.ajax({
-				async : true,
-				cache : false,
-				url : LAMS_URL + "authoring/createToolContent.do",
-				dataType : 'json',
-				data : {
-					'toolID'          : activity.toolID,
-					// if toolContentID exists, a new content will not be created, only authorURL will be fetched
-					'toolContentID'   : activity.toolContentID,
-					'contentFolderID' : layout.ld.contentFolderID
-				},
-				success : function(response) {
-					activity.authorURL = response.authorURL;
-					if (!activity.toolContentID) {
-						activity.toolContentID = response.toolContentID;
-					}
-					if (!layout.ld.contentFolderID) {
-						// if LD did not have contentFolderID, it was just generated
-						// so remember it
-						layout.ld.contentFolderID = response.contentFolderID;
-					}
-				}
-			});
+		if (activity.isAuthoringOpening) {
+			return;
 		}
 		
+		activity.isAuthoringOpening = true;
 		if (activity.authorURL) {
 			var dialogID = "dialogActivity" + activity.toolContentID;
 			showDialog(dialogID, {
@@ -1568,12 +1546,51 @@
 			}, true);
 			
 			GeneralLib.setModified(true);
+			activity.isAuthoringOpening = false;
+			return;
 		}
+		
+		// if there is no authoring URL, fetch it for a Tool Activity
+		if (activity.toolID) {
+			$.ajax({
+				async : true,
+				cache : false,
+				url : LAMS_URL + "authoring/createToolContent.do",
+				dataType : 'json',
+				data : {
+					'toolID'          : activity.toolID,
+					// if toolContentID exists, a new content will not be created, only authorURL will be fetched
+					'toolContentID'   : activity.toolContentID,
+					'contentFolderID' : layout.ld.contentFolderID
+				},
+				success : function(response) {
+					// make sure that response contains valid data
+					if (response.authorURL) {
+						activity.authorURL = response.authorURL;
+						activity.toolContentID = response.toolContentID;
+						// the response should always return a correct content folder ID,
+						// but just to make sure use it only when it is needed
+						if (!layout.ld.contentFolderID) {
+							layout.ld.contentFolderID = response.contentFolderID;
+						}
+						
+						activity.isAuthoringOpening = false;
+						// this time open it properly
+						ActivityLib.openActivityAuthoring(activity);
+					}
+				},
+				complete : function(){
+					activity.isAuthoringOpening = false;
+				}
+			});
+		} else {
+			activity.isAuthoringOpening = false;
+		}
 	},
 	
 	
 	/**
-	 * Draw each of activity's inboud and outbound transitions again.
+	 * Draw each of activity's inbound and outbound transitions again.
 	 */
 	redrawTransitions : function(activity) {
 		if (activity.transitions) {
Index: lams_central/web/includes/javascript/authoring/authoringGeneral.js
===================================================================
diff -u -rdcb81d1b2bd66f65b38ae9c167bad8d743e03ab0 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision dcb81d1b2bd66f65b38ae9c167bad8d743e03ab0)
+++ lams_central/web/includes/javascript/authoring/authoringGeneral.js	(.../authoringGeneral.js)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -1664,6 +1664,39 @@
 	},
 	
 	/**
+	 * Check if given question exists in tool activities in this sequence
+	 */
+	checkQuestionExistsInToolActivities : function(qbQuestionUid) {
+		let resultToolContentIds = [],
+			candidateToolContentIds = [];
+		
+		// list all tool activities
+		$.each(layout.activities, function() {
+			if (this.toolContentID) {
+				candidateToolContentIds.push(this.toolContentID);
+			}
+		});
+		
+		// ask back end if given activities contain the given question
+		$.ajax({
+			cache    : false,
+			async    : false,
+			url      : LAMS_URL + "qb/edit/checkQuestionExistsInToolActivities.do",
+			dataType : 'json',
+			data     : {
+				'toolContentIds' : candidateToolContentIds,
+				'qbQuestionUid' : qbQuestionUid
+			},
+			success : function(responseToolContentIds){
+				// the response is list of tool content IDs which contain the given question
+				resultToolContentIds = responseToolContentIds;
+			}
+		});
+		
+		return resultToolContentIds;
+	},
+	
+	/**
 	 * Escapes HTML tags to prevent XSS injection.
 	 */
 	escapeHtml : function(unsafe) {
@@ -2798,7 +2831,43 @@
 		};
 	},
 	
+	/**
+	 * Replaces the old question with new question in given tool activities in this sequence
+	 */
+	replaceQuestionInToolActivities : function(thisToolContentId, allToolContentIds, oldQbQuestionUid, newQbQuestionUid) {
+		let activityTitles = '',
+			questionReplaced = false;
+		
+		// list names of all tool activities which contain the old question
+		$.each(layout.activities, function() {
+			if (this.toolContentID && this.toolContentID != thisToolContentId && allToolContentIds.indexOf(this.toolContentID) > -1) {
+				activityTitles += '"' + this.title + '", ';
+			}
+		});
 	
+		// ask teacher if he wants to update other activities too
+		if (activityTitles != '' && confirm(LABELS.REPLACE_QUESTION_PROMPT.replace('[0]', activityTitles.substring(0, activityTitles.length - 2)))) {
+			$.ajax({
+				type     : 'POST',
+				cache    : false,
+				async    : false,
+				url      : LAMS_URL + "qb/edit/replaceQuestionInToolActivities.do",
+				dataType : 'text',
+				data     : {
+					'toolContentIds'   : allToolContentIds,
+					'oldQbQuestionUid' : oldQbQuestionUid,
+					'newQbQuestionUid' : newQbQuestionUid
+				},
+				success : function(){
+					questionReplaced = true;
+				}
+			});
+		}
+		
+		return questionReplaced;
+	},
+	
+	
 	resizeImportPartFrame : function(svgHeight) {
 		$('#ldStoreDialogImportPartFrame').height(svgHeight + 40);
 	},
Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -r7a19ceb8e410d05b61f130d3416ee06e36be5dd1 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision 7a19ceb8e410d05b61f130d3416ee06e36be5dd1)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -1570,15 +1570,17 @@
 			optionsFound = true;
 			
 			var suffix = '';
-			switch(this.type) {
-				case 'OUTPUT_BOOLEAN' :
-					suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
-					break;
-                                                            
-				case 'OUTPUT_LONG' :
-					suffix = LABELS.RANGE_OUTPUT_SUFFIX;
-					break;
-			};
+			if (!this.showConditionNameOnly) {
+				switch(this.type) {
+					case 'OUTPUT_BOOLEAN' :
+						suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
+						break;
+	                                                            
+					case 'OUTPUT_LONG' :
+						suffix = LABELS.RANGE_OUTPUT_SUFFIX;
+						break;
+				};
+			}
 			
 			var option = $('<option />')
 						   .text(this.description + ' ' + suffix)
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_common/db/sql/create_lams_11_tables.sql	(.../create_lams_11_tables.sql)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -475,8 +475,8 @@
   `force_restart` tinyint(1) DEFAULT '0',
   `allow_restart` tinyint(1) DEFAULT '0',
   `gradebook_on_complete` tinyint(1) DEFAULT '1',
-  `use_alternative_user_id_parameter_name` tinyint(1) DEFAULT '0',
   `membership_url` text COLLATE utf8mb4_unicode_ci,
+  `user_id_parameter_name` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`sid`),
   UNIQUE KEY `serverid` (`serverid`),
   UNIQUE KEY `prefix` (`prefix`),
@@ -982,6 +982,7 @@
   `gate_start_time_offset` bigint(38) DEFAULT NULL,
   `gate_end_time_offset` bigint(38) DEFAULT NULL,
   `gate_activity_completion_based` tinyint(1) DEFAULT NULL,
+  `gate_password` varchar(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `library_activity_ui_image` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `create_grouping_id` bigint(20) DEFAULT NULL,
   `create_grouping_ui_id` int(11) DEFAULT NULL,
Index: lams_common/db/sql/insert_lams_config_data.sql
===================================================================
diff -u -r2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_common/db/sql/insert_lams_config_data.sql	(.../insert_lams_config_data.sql)	(revision 2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe)
+++ lams_common/db/sql/insert_lams_config_data.sql	(.../insert_lams_config_data.sql)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -20,7 +20,10 @@
 ('QbCollectionsTransferEnable', 'true', 'config.qb.collections.transfer.enable', 'config.header.qb', 'BOOLEAN', 1),
 ('RestrictedGroupUserNames','true', 'config.restricted.displaying.user.names.in.groupings', 'config.header.privacy.settings', 'BOOLEAN', 0),
 ('EnableCollapsingSubcourses','false', 'config.enable.collapsing.subcourses', 'config.header.features', 'BOOLEAN', 0),
-('LearningOutcomeQuickAddEnable', 'true', 'config.learning.outcome.add.enable', 'config.header.features', 'BOOLEAN', 1);
+('LearningOutcomeQuickAddEnable', 'true', 'config.learning.outcome.add.enable', 'config.header.features', 'BOOLEAN', 1),
+('EtherpadServerUrl','http://localhost:9001','config.etherpad.server.url','config.header.etherpad','STRING', 0),
+('EtherpadApiKey','','config.etherpad.api.key','config.header.etherpad','STRING', 0),
+('EtherpadInstanceID','LAMS','config.etherpad.instance.id','config.header.etherpad','STRING', 0);
 UNLOCK TABLES;
 
 SET FOREIGN_KEY_CHECKS=1;
Index: lams_common/db/sql/insert_types_data.sql
===================================================================
diff -u -r2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision 2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe)
+++ lams_common/db/sql/insert_types_data.sql	(.../insert_types_data.sql)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -78,7 +78,7 @@
 --
 
 LOCK TABLES `lams_learning_activity_type` WRITE;
-INSERT INTO `lams_learning_activity_type` VALUES (1,'TOOL'),(2,'GROUPING'),(3,'GATE_SYNCH'),(4,'GATE_SCHEDULE'),(5,'GATE_PERMISSION'),(6,'PARALLEL'),(7,'OPTIONS'),(8,'SEQUENCE'),(9,'GATE_SYSTEM'),(10,'BRANCHING_CHOSEN'),(11,'BRANCHING_GROUP'),(12,'BRANCHING_TOOL'),(13,'OPTIONS_WITH_SEQUENCES'),(14,'GATE_CONDITION'),(15,'FLOATING');
+INSERT INTO `lams_learning_activity_type` VALUES (1,'TOOL'),(2,'GROUPING'),(3,'GATE_SYNCH'),(4,'GATE_SCHEDULE'),(5,'GATE_PERMISSION'),(6,'PARALLEL'),(7,'OPTIONS'),(8,'SEQUENCE'),(9,'GATE_SYSTEM'),(10,'BRANCHING_CHOSEN'),(11,'BRANCHING_GROUP'),(12,'BRANCHING_TOOL'),(13,'OPTIONS_WITH_SEQUENCES'),(14,'GATE_CONDITION'),(15,'FLOATING'),(16, 'GATE_PASSWORD');
 UNLOCK TABLES;
 
 --
@@ -190,7 +190,7 @@
 --
 
 LOCK TABLES `lams_system_tool` WRITE;
-INSERT INTO `lams_system_tool` VALUES (1,2,'Grouping','All types of grouping including random and chosen.','learning/grouping/performGrouping.do','learning/grouping/performGrouping.do','learning/grouping/viewGrouping.do?mode=teacher','monitoring/grouping/startGrouping.do','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,'pedagogicalPlanner/grouping.do?method=initGrouping'),(2,3,'Sync Gate','Gate: Synchronise Learners.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(3,4,'Schedule Gate','Gate: Opens/shuts at particular times.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(4,5,'Permission Gate','Gate: Opens under teacher or staff control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(5,9,'System Gate','Gate: Opens under system control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(6,10,'Monitor Chosen Branching','Select between multiple sequence activities, with the branch chosen in monitoring.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/chosenBranching.do?method=assignBranch','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,NULL),(7,11,'Group Based Branching','Select between multiple sequence activities, with the branch chosen by an existing group.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/groupedBranching.do?method=viewBranching','monitoring/groupedBranching.do?method=assignBranch',NULL,NOW(),NULL,NULL),(8,12,'Tool Output Based Branching','Select between multiple sequence activities, with the branch chosen on results of another activity.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/toolBranching.do?method=viewBranching','monitoring/toolBranching.do?method=viewBranching',NULL,NOW(),NULL,NULL),(9,8,'Sequence','A sequence of activities','learning/SequenceActivity.do','learning/SequenceActivity.do','monitoring/complexProgress.do','monitoring/sequence/viewSequence.do','monitoring/sequence/viewSequence.do',NULL,NOW(),NULL,NULL),(10,14,'Condition Gate','Gate: Opens if conditions are met','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(11,15,'Floating Activities','A collection of floating activities',NULL,NULL,NULL,'monitoring/floating.do?method=viewFloating','monitoring/floating.do?method=viewFloating',NULL,NOW(),NULL,NULL);
+INSERT INTO `lams_system_tool` VALUES (1,2,'Grouping','All types of grouping including random and chosen.','learning/grouping/performGrouping.do','learning/grouping/performGrouping.do','learning/grouping/viewGrouping.do?mode=teacher','monitoring/grouping/startGrouping.do','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,'pedagogicalPlanner/grouping.do?method=initGrouping'),(2,3,'Sync Gate','Gate: Synchronise Learners.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(3,4,'Schedule Gate','Gate: Opens/shuts at particular times.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(4,5,'Permission Gate','Gate: Opens under teacher or staff control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(5,9,'System Gate','Gate: Opens under system control.','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(6,10,'Monitor Chosen Branching','Select between multiple sequence activities, with the branch chosen in monitoring.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/chosenBranching.do?method=assignBranch','monitoring/grouping/startGrouping.do',NULL,NOW(),NULL,NULL),(7,11,'Group Based Branching','Select between multiple sequence activities, with the branch chosen by an existing group.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/groupedBranching.do?method=viewBranching','monitoring/groupedBranching.do?method=assignBranch',NULL,NOW(),NULL,NULL),(8,12,'Tool Output Based Branching','Select between multiple sequence activities, with the branch chosen on results of another activity.','learning/branching/performBranching.do','learning/branching/performBranching.do','monitoring/complexProgress.do','monitoring/toolBranching.do?method=viewBranching','monitoring/toolBranching.do?method=viewBranching',NULL,NOW(),NULL,NULL),(9,8,'Sequence','A sequence of activities','learning/SequenceActivity.do','learning/SequenceActivity.do','monitoring/complexProgress.do','monitoring/sequence/viewSequence.do','monitoring/sequence/viewSequence.do',NULL,NOW(),NULL,NULL),(10,14,'Condition Gate','Gate: Opens if conditions are met','learning/gate/knockGate.do','learning/gate/knockGate.do',NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do',NULL,NOW(),NULL,NULL),(11,15,'Floating Activities','A collection of floating activities',NULL,NULL,NULL,'monitoring/floating.do?method=viewFloating','monitoring/floating.do?method=viewFloating',NULL,NOW(),NULL,NULL),(12, 16, 'Password Gate', 'Gate: Opens if learner provides correct password','learning/gate/knockGate.do', 'learning/gate/knockGate.do', NULL,'monitoring/gate/viewGate.do','monitoring/gate/viewGate.do', NULL, now(), NULL, NULL);
 UNLOCK TABLES;
 
 
Fisheye: Tag c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -19,6 +19,7 @@
 import org.lamsfoundation.lams.qb.dao.IQbDAO;
 import org.lamsfoundation.lams.qb.model.QbCollection;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
+import org.lamsfoundation.lams.tool.ToolContent;
 
 public class QbDAO extends LAMSBaseDAO implements IQbDAO {
 
@@ -32,6 +33,10 @@
 	    + "WHERE a.toolContentId = q.toolContentId AND l IS NOT EMPTY AND l.lessonStateId IN (3,4,5,6) AND q.qbQuestion.uid = :qbQuestionUid "
 	    + "ORDER BY l.organisation.name, l.lessonName";
 
+    private static final String FIND_QUESTION_ACTIVITIES_FILTERED_BY_TOOL_CONTENT_ID = "SELECT c FROM QbToolQuestion AS q, ToolContent AS c "
+	    + "WHERE c.toolContentId = q.toolContentId AND c.tool.toolSignature IN ('laasse10', 'lascrt11') AND "
+	    + "q.qbQuestion.uid = :qbQuestionUid AND q.toolContentId IN (:toolContentIds)";
+
     private static final String FIND_QUESTION_VERSIONS = "SELECT q FROM QbQuestion AS q, QbQuestion AS r "
 	    + "WHERE q.questionId = r.questionId AND q.uid <> r.uid AND r.uid = :qbQuestionUid";
 
@@ -194,6 +199,14 @@
 
     @Override
     @SuppressWarnings("unchecked")
+    public List<ToolContent> getQuestionActivities(long qbQuestionUid, Collection<Long> filteringToolContentIds) {
+	return this.getSession().createQuery(FIND_QUESTION_ACTIVITIES_FILTERED_BY_TOOL_CONTENT_ID)
+		.setParameter("qbQuestionUid", qbQuestionUid)
+		.setParameterList("toolContentIds", filteringToolContentIds).list();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
     public List<QbQuestion> getQuestionVersions(long qbQuestionUid) {
 	return this.getSession().createQuery(FIND_QUESTION_VERSIONS).setParameter("qbQuestionUid", qbQuestionUid)
 		.list();
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -rb5d2a6851ee4797e641081bd5e6a1f28f78c30a6 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision b5d2a6851ee4797e641081bd5e6a1f28f78c30a6)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -66,7 +66,6 @@
 import org.lamsfoundation.lams.util.CommonConstants;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileUtilException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 /**
  * @author Jacky Fang
@@ -237,7 +236,7 @@
 
 	// check if there is leaderSelectionTool available
 	if (leaderSelectionActivity != null) {
-	    User learner = (User) toolContentDAO.find(User.class, learnerId);
+	    User learner = toolContentDAO.find(User.class, learnerId);
 	    String outputName = LamsToolService.LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID;
 	    ToolSession leaderSelectionSession = toolSessionDAO.getToolSessionByLearner(learner,
 		    leaderSelectionActivity);
@@ -276,7 +275,7 @@
     public Set<Long> getLeaderUserId(Long leaderSelectionActivityId) {
 	Activity activity = activityDAO.getActivityByActivityId(leaderSelectionActivityId);
 	List<ToolSession> toolSessions = toolSessionDAO.getToolSessionByActivity(activity);
-	Set<Long> result = new TreeSet<Long>();
+	Set<Long> result = new TreeSet<>();
 	for (ToolSession toolSession : toolSessions) {
 	    ToolOutput output = lamsCoreToolService.getOutputFromTool(LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID,
 		    toolSession, null);
@@ -370,10 +369,10 @@
 	    return null;
 	}
 
-	Set<Long> confidenceProvidingActivityIds = new LinkedHashSet<Long>();
+	Set<Long> confidenceProvidingActivityIds = new LinkedHashSet<>();
 	findPrecedingAssessmentActivities(specifiedActivity, confidenceProvidingActivityIds);
 
-	Set<ToolActivity> confidenceProvidingActivities = new LinkedHashSet<ToolActivity>();
+	Set<ToolActivity> confidenceProvidingActivities = new LinkedHashSet<>();
 	for (Long confidenceProvidingActivityId : confidenceProvidingActivityIds) {
 	    ToolActivity confidenceProvidingActivity = (ToolActivity) activityDAO
 		    .getActivityByActivityId(confidenceProvidingActivityId, ToolActivity.class);
@@ -384,7 +383,7 @@
     }
 
     /**
-     * Finds all preceding activities that can provide confidence levels (currently only Assessment provide
+     * Finds all preceding activities that can provide confidence levels (currently only Assessment and MCQ provide
      * them). Please note, it does not check whether enableConfidenceLevels advanced option is ON in those activities.
      */
     @SuppressWarnings("rawtypes")
@@ -438,7 +437,7 @@
 	    return;
 	}
     }
-    
+
     @Override
     public Set<ToolActivity> getActivitiesProvidingVsaAnswers(Long toolContentId) {
 	ToolActivity specifiedActivity = activityDAO.getToolActivityByToolContentId(toolContentId);
@@ -448,10 +447,10 @@
 	    return null;
 	}
 
-	Set<Long> providingVsaAnswersActivityIds = new LinkedHashSet<Long>();
+	Set<Long> providingVsaAnswersActivityIds = new LinkedHashSet<>();
 	findPrecedingAssessmentActivities(specifiedActivity, providingVsaAnswersActivityIds);
 
-	Set<ToolActivity> activitiesProvidingVsaAnswers = new LinkedHashSet<ToolActivity>();
+	Set<ToolActivity> activitiesProvidingVsaAnswers = new LinkedHashSet<>();
 	for (Long confidenceProvidingActivityId : providingVsaAnswersActivityIds) {
 	    ToolActivity activityProvidingVsaAnswers = (ToolActivity) activityDAO
 		    .getActivityByActivityId(confidenceProvidingActivityId, ToolActivity.class);
@@ -464,7 +463,7 @@
     @Override
     public List<ConfidenceLevelDTO> getConfidenceLevelsByActivity(Integer confidenceLevelActivityUiid,
 	    Integer requestorUserId, Long requestorToolSessionId) {
-	User user = (User) activityDAO.find(User.class, requestorUserId);
+	User user = activityDAO.find(User.class, requestorUserId);
 	if (user == null) {
 	    throw new ToolException("No user found for userId=" + requestorUserId);
 	}
@@ -490,11 +489,11 @@
 		.getConfidenceLevelsByToolSession(confidenceLevelSession);
 	return confidenceLevelDtos;
     }
-    
+
     @Override
     public Collection<VsaAnswerDTO> getVsaAnswersFromAssessment(Integer activityUiidProvidingVsaAnswers,
 	    Integer requestorUserId, Long requestorToolSessionId) {
-	User user = (User) activityDAO.find(User.class, requestorUserId);
+	User user = activityDAO.find(User.class, requestorUserId);
 	if (user == null) {
 	    throw new ToolException("No user found for userId=" + requestorUserId);
 	}
@@ -509,13 +508,13 @@
 	ToolSession assessmentSession = toolSessionDAO.getToolSessionByLearner(user, activityProvidingVsaAnswers);
 	return lamsCoreToolService.getVsaAnswersByToolSession(assessmentSession);
     }
-    
+
     @Override
-    public void recalculateScratchieMarksForVsaQuestion(Long qbQuestionUid) {
+    public void recalculateScratchieMarksForVsaQuestion(Long qbQuestionUid, String answer) {
 	Tool scratchieTool = toolDAO.getToolBySignature(CommonConstants.TOOL_SIGNATURE_SCRATCHIE);
 	ICommonScratchieService sessionManager = (ICommonScratchieService) lamsCoreToolService
 		.findToolService(scratchieTool);
-	sessionManager.recalculateScratchieMarksForVsaQuestion(qbQuestionUid);
+	sessionManager.recalculateScratchieMarksForVsaQuestion(qbQuestionUid, answer);
     }
 
     @Override
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -22,10 +22,12 @@
 package org.lamsfoundation.lams.gradebook.service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -118,10 +120,10 @@
  */
 public class GradebookService implements IGradebookFullService {
     private static Logger logger = Logger.getLogger(GradebookService.class);
+    
+    private static final Set<String> LESSON_EXPORT_TOOL_ACTIVITIES = new HashSet<>(
+	    Arrays.asList("laasse10", "lascrt11", "ladoku11"));
 
-    private static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10";
-    public static final String TOOL_SIGNATURE_SCRATCHIE = "lascrt11";
-
     // Services
     private ILamsCoreToolService toolService;
     private IGradebookDAO gradebookDAO;
@@ -1215,8 +1217,7 @@
 	for (ToolActivity activity : activityToUserDTOMap.keySet()) {
 	    String toolSignature = activity.getTool().getToolSignature();
 	    //check whether toolActivity has a NumericToolOutput
-	    if (activity.getEvaluation() != null && (TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)
-		    || TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature))) {
+	    if (activity.getEvaluation() != null && LESSON_EXPORT_TOOL_ACTIVITIES.contains(toolSignature)) {
 		filteredActivityToUserDTOMap.put(activity, activityToUserDTOMap.get(activity));
 	    }
 	}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -1656,4 +1656,9 @@
 	return kumalive == null || kumalive.getFinished();
     }
 
+    @Override
+    public boolean isLearnerStartedLessonByContentId(int userId, long toolContentId) {
+	Lesson lesson = lessonService.getLessonByToolContentId(toolContentId);
+	return lesson != null && getProgress(userId, lesson.getLessonId()) != null;
+    }
 }
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(.../MonitoringController.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(.../MonitoringController.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -583,7 +583,9 @@
 	}
 
 	long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-	String learnerIDs = request.getParameter(MonitoringConstants.PARAM_LEARNER_ID);
+	String learnerIDsParam = request.getParameter(MonitoringConstants.PARAM_LEARNER_ID);
+	// are we moving selected learners or all of learners who are currently in the activity
+	Long moveAllFromActivityId = WebUtil.readLongParam(request, "moveAllFromActivityID", true);
 	Integer requesterId = getUserId();
 	boolean removeLearnerContent = WebUtil.readBooleanParam(request,
 		MonitoringConstants.PARAM_REMOVE_LEARNER_CONTENT, false);
@@ -600,39 +602,45 @@
 		    .toString();
 	}
 
-	StringBuffer learnerIdNameBuf = new StringBuffer();
-	String message = null;
-	User learner = null;
-	boolean oneOrMoreProcessed = false;
-	try {
-	    for (String learnerIDString : learnerIDs.split(",")) {
-		if (oneOrMoreProcessed) {
-		    learnerIdNameBuf.append(", ");
-		} else {
-		    oneOrMoreProcessed = true;
-		}
+	List<User> learners = null;
+	if (moveAllFromActivityId == null) {
+	    learners = new LinkedList<>();
+	    for (String learnerIDString : learnerIDsParam.split(",")) {
 		Integer learnerID = Integer.valueOf(learnerIDString);
-		message = monitoringService.forceCompleteActivitiesByUser(learnerID, requesterId, lessonId, activityId,
-			removeLearnerContent);
+		User learner = (User) userManagementService.findById(User.class, learnerID);
+		learners.add(learner);
+	    }
+	} else {
+	    learners = monitoringService.getLearnersByActivities(new Long[] { moveAllFromActivityId }, null, null,
+		    true);
+	}
 
-		learner = (User) userManagementService.findById(User.class, learnerID);
+	String message = null;
+	StringBuilder learnerIdNameBuilder = new StringBuilder();
+
+	try {
+	    for (User learner : learners) {
+		message = monitoringService.forceCompleteActivitiesByUser(learner.getUserId(), requesterId, lessonId,
+			activityId, removeLearnerContent);
 		learnerService.createCommandForLearner(lessonId, learner.getLogin(), command);
-		learnerIdNameBuf.append(learner.getLogin()).append(" (").append(learnerID).append(")");
+		learnerIdNameBuilder.append(learner.getLogin()).append(" (").append(learner.getUserId()).append(")")
+			.append(", ");
 	    }
 	} catch (SecurityException e) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
 	    return;
 	}
 
+	String learnerIdNameString = learnerIdNameBuilder.substring(0, learnerIdNameBuilder.length() - 2);
 	if (log.isDebugEnabled()) {
-	    log.debug("Force complete for learners " + learnerIdNameBuf.toString() + " lesson " + lessonId + ". "
+	    log.debug("Force complete for learners " + learnerIdNameString.toString() + " lesson " + lessonId + ". "
 		    + message);
 	}
 
 	// audit log force completion attempt
 	String messageKey = (activityId == null) ? "audit.force.complete.end.lesson" : "audit.force.complete";
 
-	Object[] args = new Object[] { learnerIdNameBuf.toString(), activityDescription, lessonId };
+	Object[] args = new Object[] { learnerIdNameString, activityDescription, lessonId };
 	String auditMessage = messageService.getMessage(messageKey, args);
 	logEventService.logEvent(LogEvent.TYPE_FORCE_COMPLETE, requesterId, null, lessonId, activityId,
 		auditMessage + " " + message);
@@ -1059,7 +1067,7 @@
 
 	String searchPhrase = request.getParameter("searchPhrase");
 	Integer pageNumber = WebUtil.readIntParam(request, "pageNumber", true);
-	if (pageNumber == null) {
+	if (pageNumber == null || pageNumber < 1) {
 	    pageNumber = 1;
 	}
 	// are the learners sorted by the most completed first?
Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -54,16 +54,18 @@
 			
 			// refresh automatically every X seconds
 			window.setInterval(function(){
-				loadTab(null, null, true);
+				refresh(true);
 			}, TAB_REFRESH_INTERVAL);
 		});
 
 		function loadTab(method, toolContentID, autoRefresh) {
 			if (!method && !toolContentID) {
 				// tab was refreshed, get stored parameters
 				method = lastTabMethod;
-				if (autoRefresh && (method == 'burningQuestions' || method == 'aes' || method == 'aesStudentChoices')) {
+
+				if (autoRefresh && (method == 'burningQuestions' || method == 'aes' || method == 'aesStudentChoices' || method == 'sequence' || $('.modal').hasClass('in'))){
 					// do not auto refresh Burning Questions nor AES tabs
+					// or if a modal dialog is open
 					return;
 				}	
 				
@@ -154,8 +156,8 @@
 	        }, 100);
 		}
 
-		function refresh() {
-			loadTab();
+		function refresh(autoRefresh) {
+			loadTab(null, null, autoRefresh);
 		}
 
         function switchToRegularMonitor() {
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -147,7 +147,7 @@
 label.monitoring.summary.total = Total
 label.monitoring.summary.learner.summary = Learner summary
 label.monitoring.user.summary.history.responses = History of responses
-label.monitoring.user.summary.user.name = Username
+label.monitoring.user.summary.user.name = User name
 label.monitoring.user.summary.number.attempts = Number of attempts
 label.monitoring.user.summary.time.last.attempt = Time in the last attempt
 label.monitoring.user.summary.last.attempt.grade = Last attempt grade
@@ -199,7 +199,7 @@
 label.export.average = Average
 label.export.summary.by.user = Summary by learner
 lable.export.summary.by.question = Summary by question
-label.export.user.id = Username
+label.export.user.id = User name
 label.authoring.basic.allow.learners.rich.editor = Allow learners to use rich text editor
 label.authoring.advance.allow.students.right.answers = Indicate choice(s) that have been answered correctly.
 label.authoring.advance.allow.students.wrong.answers = Indicate choice(s) that have been answered incorrectly.
@@ -234,7 +234,7 @@
 label.authoring.basic.import.questions = Import
 label.authoring.basic.export.questions = Export
 label.authoring.advance.display.summary = Display all questions and answers once the learner finishes.
-label.authoring.basic.import.qti = Import IMS QTI
+label.authoring.basic.import.qti = IMS QTI
 advanced.reflectOnActivity = Add a notebook at end of Assessment with the following instructions:
 monitor.summary.td.addNotebook = Add a notebook at end of Assessment
 monitor.summary.td.notebookInstructions = Notebook instructions
@@ -244,7 +244,7 @@
 label.submit = Finish
 label.authoring.advance.numbered.questions = Enable questions' numbering
 label.learning.draft.autosaved = Draft autosaved
-label.waiting.for.leader = Please, wait while somebody will become a group leader
+label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners participating in current group:
 label.use.select.leader.tool.output = Use leaders from Select Leader tool
 label.group.leader = Group leader: {0}
@@ -311,7 +311,7 @@
 label.no.question.references = No questions have been added to the question list. Do you still want to proceed with no questions?
 label.hide.name.column = Hide name column
 label.ae.questions.marks = AE Questions & Marks
-label.ira.questions.marks = iRA Questions & Marks
+label.ira.questions.marks = iRAT Questions & Marks
 label.attendance = Attendance
 label.show.students.choices = Show students' choices
 label.hide.students.choices = Hide students' choices
@@ -405,6 +405,26 @@
 label.comment.textarea.tip = Type your comment here then click on the green tick
 error.resource.image.comment.blank = Comment can not be blank.
 label.student.choices = Student's choices
+message.disclose.correct.answers = Please confirm that you want to disclose the correct answer for this question. Note that after you confirm this, this action cannot be reversed. Are you sure you want to do this?
+message.disclose.groups.answers = Please confirm that you want to disclose the groups' answers for this question. Note that after you confirm this, this action cannot be reversed. Are you sure you want to do this?
+message.disclose.all.correct.answers = Please confirm that you want to disclose ALL the correct answers for ALL questions. Note that after you confirm this, this action cannot be reversed. Are you sure you want to do this?
+message.disclose.all.groups.answers = Please confirm that you want to disclose the answers of ALL groups for ALL the questions. Note that after you confirm this, this action cannot be reversed. Are you sure you want to do this?
+label.monitoring.summary.completion = Completion
+label.monitoring.summary.completion.possible = Not started
+label.monitoring.summary.completion.started = In progress
+label.monitoring.summary.completion.completed = Completed
+label.monitoring.summary.answered.questions = Students Progress
+label.monitoring.summary.answered.questions.x.axis = Number of answered questions
+label.monitoring.summary.answered.questions.y.axis.students = Students
+label.authoring.basic.import.word = MS Word
+label.monitoring.summary.answered.questions.y.axis.groups = Groups
+label.monitoring.summary.answered.questions.groups = Groups Progress
+label.authoring.basic.question.version = Version
+label.authoring.basic.question.version.newer.tooltip = There is a newer version of this question
+label.authoring.basic.question.version.change.tooltip = Change to this version
+label.authoring.basic.question.version.stats.tooltip = See this version's stats page
+label.export.questions = Questions
+label.export.group = Group
 
 label.export.marks.mcq  =Export marks for MCQ questions
 label.not.available  =N/A
Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
diff -u -r2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision 2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe)
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	(.../create_lams_tool_assessment.sql)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -28,6 +28,7 @@
    reflect_instructions MEDIUMTEXT,
    numbered tinyint(1) DEFAULT 1,
    use_select_leader_tool_ouput tinyint(1) NOT NULL DEFAULT 0,
+   question_etherpad_enabled TINYINT(1) DEFAULT 0,
    enable_confidence_levels TINYINT(1) NOT NULL DEFAULT 0,
    confidence_levels_type TINYINT DEFAULT 1,
    PRIMARY KEY (uid),
Fisheye: Tag c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -39,13 +39,13 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.UUID;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -74,10 +74,15 @@
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.logevent.LearnerInteractionEvent;
+import org.lamsfoundation.lams.logevent.service.ILearnerInteractionService;
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.outcome.Outcome;
+import org.lamsfoundation.lams.outcome.OutcomeMapping;
+import org.lamsfoundation.lams.outcome.service.IOutcomeService;
 import org.lamsfoundation.lams.qb.model.QbCollection;
 import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
@@ -121,6 +126,7 @@
 import org.lamsfoundation.lams.tool.assessment.model.QuestionReference;
 import org.lamsfoundation.lams.tool.assessment.util.AnswerIntComparator;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils;
+import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils.AssessmentExcelCell;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentSessionComparator;
 import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
 import org.lamsfoundation.lams.tool.assessment.web.controller.LearningWebsocketServer;
@@ -136,6 +142,7 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.excel.ExcelCell;
 import org.lamsfoundation.lams.util.excel.ExcelRow;
 import org.lamsfoundation.lams.util.excel.ExcelSheet;
@@ -194,6 +201,10 @@
 
     private IQbService qbService;
 
+    private IOutcomeService outcomeService;
+
+    private ILearnerInteractionService learnerInteractionService;
+
     // *******************************************************************************
     // Service method
     // *******************************************************************************
@@ -213,22 +224,14 @@
 
 	AssessmentSession assessmentSession = getSessionBySessionId(toolSessionId);
 	AssessmentUser leader = assessmentSession.getGroupLeader();
-	// check leader select tool for a leader only in case QA tool doesn't know it. As otherwise it will screw
+	// check leader select tool for a leader only in case Assessment tool doesn't know it. As otherwise it will screw
 	// up previous scratches done
 	if (leader == null) {
 
 	    Long leaderUserId = toolService.getLeaderUserId(toolSessionId, user.getUserId().intValue());
-	    if (leaderUserId != null) {
-		leader = getUserByIDAndSession(leaderUserId, toolSessionId);
-
-		// create new user in a DB
-		if (leader == null) {
-		    log.debug("creating new user with userId: " + leaderUserId);
-		    User leaderDto = (User) userManagementService.findById(User.class, leaderUserId.intValue());
-		    leader = new AssessmentUser(leaderDto.getUserDTO(), assessmentSession);
-		    createUser(leader);
-		}
-
+	    // set leader only if current user is the leader
+	    if (user.getUserId().equals(leaderUserId)) {
+		leader = user;
 		// set group leader
 		assessmentSession.setGroupLeader(leader);
 		assessmentSessionDao.saveObject(assessmentSession);
@@ -361,7 +364,25 @@
 	return assessmentUserDao.getCountUsersByContentId(contentId);
     }
 
+    /**
+     * How many learners can possibly access this activity
+     */
     @Override
+    public int getCountLessonLearnersByContentId(long contentId) {
+	long lessonId = lessonService.getLessonByToolContentId(contentId).getLessonId();
+	return lessonService.getCountLessonLearners(lessonId, null);
+    }
+
+    /**
+     * How many learners have already finished answering questions.
+     * They are either on results page or left the activity completely.
+     */
+    @Override
+    public int getCountLearnersWithFinishedCurrentAttempt(long contentId) {
+	return assessmentResultDao.countLastFinishedAssessmentResults(contentId);
+    }
+
+    @Override
     public List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page,
 	    int size, String sortBy, String sortOrder, String searchString) {
 	return assessmentUserDao.getPagedUsersBySessionAndQuestion(sessionId, questionUid, page, size, sortBy,
@@ -769,47 +790,35 @@
 	    }
 
 	} else if (questionDto.getType() == QbQuestion.TYPE_VERY_SHORT_ANSWERS) {
+
 	    //clear previous answer
 	    questionResult.setQbOption(null);
 
-	    for (OptionDTO optionDto : questionDto.getOptionDtos()) {
-		String[] optionAnswers = optionDto.getName().strip().split("\\r\\n");
-		boolean isAnswerMatchedCurrentOption = false;
-		for (String optionAnswer : optionAnswers) {
-		    optionAnswer = optionAnswer.strip();
+	    if (questionDto.getAnswer() != null) {
+		boolean isQuestionCaseSensitive = questionDto.isCaseSensitive();
+		String normalisedQuestionAnswer = AssessmentEscapeUtils.normaliseVSAnswer(questionDto.getAnswer());
 
-		    //prepare regex which takes into account only * special character
-		    String regexWithOnlyAsteriskSymbolActive = "\\Q";
-		    for (int i = 0; i < optionAnswer.length(); i++) {
-			//everything in between \\Q and \\E are taken literally no matter which characters it contains
-			if (optionAnswer.charAt(i) == '*') {
-			    regexWithOnlyAsteriskSymbolActive += "\\E.*\\Q";
-			} else {
-			    regexWithOnlyAsteriskSymbolActive += optionAnswer.charAt(i);
+		for (OptionDTO optionDto : questionDto.getOptionDtos()) {
+		    Collection<String> optionAnswers = AssessmentEscapeUtils.normaliseVSOption(optionDto.getName());
+		    boolean isAnswerMatchedCurrentOption = false;
+		    for (String optionAnswer : optionAnswers) {
+			String normalisedOptionAnswer = AssessmentEscapeUtils.normaliseVSAnswer(optionAnswer);
+
+			// check is item unraveled
+			if (isQuestionCaseSensitive ? normalisedQuestionAnswer.equals(normalisedOptionAnswer)
+				: normalisedQuestionAnswer.equalsIgnoreCase(normalisedOptionAnswer)) {
+			    isAnswerMatchedCurrentOption = true;
+			    break;
 			}
 		    }
-		    regexWithOnlyAsteriskSymbolActive += "\\E";
 
-		    //check whether answer matches regex
-		    Pattern pattern;
-		    if (questionDto.isCaseSensitive()) {
-			pattern = Pattern.compile(regexWithOnlyAsteriskSymbolActive);
-		    } else {
-			pattern = Pattern.compile(regexWithOnlyAsteriskSymbolActive,
-				java.util.regex.Pattern.CASE_INSENSITIVE | java.util.regex.Pattern.UNICODE_CASE);
-		    }
-		    if (questionDto.getAnswer() != null && pattern.matcher(questionDto.getAnswer().strip()).matches()) {
-			isAnswerMatchedCurrentOption = true;
+		    if (isAnswerMatchedCurrentOption) {
+			mark = optionDto.getMaxMark() * maxMark;
+			QbOption qbOption = qbService.getOptionByUid(optionDto.getUid());
+			questionResult.setQbOption(qbOption);
 			break;
 		    }
 		}
-
-		if (isAnswerMatchedCurrentOption) {
-		    mark = optionDto.getMaxMark() * maxMark;
-		    QbOption qbOption = qbService.getOptionByUid(optionDto.getUid());
-		    questionResult.setQbOption(qbOption);
-		    break;
-		}
 	    }
 
 	} else if (questionDto.getType() == QbQuestion.TYPE_NUMERICAL) {
@@ -1377,14 +1386,20 @@
 		}
 
 		boolean isAnswerAllocated = false;
+		boolean isQuestionCaseSensitive = question.getQbQuestion().isCaseSensitive();
+		String normalisedAnswer = AssessmentEscapeUtils.normaliseVSAnswer(answer);
 		for (QbOption option : qbQuestion.getQbOptions()) {
-		    String[] alternatives = option.getName().split("\r\n");
+		    Collection<String> alternatives = AssessmentEscapeUtils.normaliseVSOption(option.getName());
 		    for (String alternative : alternatives) {
-			if (AssessmentServiceImpl.isAnswersEqual(question, answer, alternative)) {
+			if (isQuestionCaseSensitive ? normalisedAnswer.equals(alternative)
+				: normalisedAnswer.equalsIgnoreCase(alternative)) {
 			    isAnswerAllocated = true;
 			    break;
 			}
 		    }
+		    if (isAnswerAllocated) {
+			break;
+		    }
 		}
 
 		if (!isAnswerAllocated) {
@@ -1405,52 +1420,58 @@
 	if (answer1 == null || answer2 == null) {
 	    return false;
 	}
+	String normalisedAnswer1 = AssessmentEscapeUtils.normaliseVSAnswer(answer1);
+	String normalisedAnswer2 = AssessmentEscapeUtils.normaliseVSAnswer(answer2);
 
-	return question.getQbQuestion().isCaseSensitive() ? answer1.equals(answer2) : answer1.equalsIgnoreCase(answer2);
+	return question.getQbQuestion().isCaseSensitive() ? normalisedAnswer1.equals(normalisedAnswer2)
+		: normalisedAnswer1.equalsIgnoreCase(normalisedAnswer2);
     }
 
     @Override
-    public Optional<Long> allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid,
-	    Long questionResultUid) {
+    public Long allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid, String answer) {
 	AssessmentQuestion assessmentQuestion = assessmentQuestionDao.getByUid(questionUid);
 	QbQuestion qbQuestion = assessmentQuestion.getQbQuestion();
-	AssessmentQuestionResult questionRes = assessmentQuestionResultDao
-		.getAssessmentQuestionResultByUid(questionResultUid);
-	String answer = questionRes.getAnswer();
+	String normalisedAnswer = AssessmentEscapeUtils.normaliseVSAnswer(answer);
 
 	//adding
 	if (previousOptionUid.equals(-1L)) {
 	    //search for duplicates and, if found, return false
+	    QbOption targetOption = null;
 	    for (QbOption option : qbQuestion.getQbOptions()) {
 		String name = option.getName();
-		String[] alternatives = name.split("\r\n");
-		if (Arrays.asList(alternatives).contains(answer)) {
-		    return Optional.of(option.getUid());
+		Collection<String> alternatives = AssessmentEscapeUtils.normaliseVSOption(name);
+		if (alternatives.contains(normalisedAnswer)) {
+		    return option.getUid();
 		}
-	    }
-
-	    for (QbOption targetOption : qbQuestion.getQbOptions()) {
-		if (targetOption.getUid().equals(targetOptionUid)) {
-		    String name = targetOption.getName();
-		    name += "\r\n" + answer;
-		    targetOption.setName(name);
-		    assessmentDao.saveObject(targetOption);
-		    break;
+		if (option.getUid().equals(targetOptionUid)) {
+		    targetOption = option;
 		}
 	    }
 
+	    String name = targetOption.getName();
+	    name += "\r\n" + answer;
+	    targetOption.setName(name);
+	    assessmentDao.saveObject(targetOption);
+
+	    if (log.isDebugEnabled()) {
+		log.debug("Adding answer \"" + answer + "\" to option " + targetOptionUid + " in question "
+			+ questionUid);
+	    }
+	    return null;
 	}
+
 	//removing
-	else if (targetOptionUid.equals(-1L)) {
+	if (targetOptionUid.equals(-1L)) {
 	    for (QbOption previousOption : qbQuestion.getQbOptions()) {
 		if (previousOption.getUid().equals(previousOptionUid)) {
 		    String name = previousOption.getName();
-		    String[] alternatives = name.split("\r\n");
+		    String[] alternatives = name.split(",");
 
-		    String nameWithoutUserAnswer = "";
+		    StringBuilder nameWithoutUserAnswer = new StringBuilder();
 		    for (String alternative : alternatives) {
-			if (!alternative.equals(answer)) {
-			    nameWithoutUserAnswer += alternative + "\r\n";
+			String normalisedAlternative = AssessmentEscapeUtils.normaliseVSAnswer(alternative);
+			if (!normalisedAlternative.equals(normalisedAnswer)) {
+			    nameWithoutUserAnswer.append(alternative).append("\r\n");
 			}
 		    }
 		    if (nameWithoutUserAnswer.length() > 2) {
@@ -1460,96 +1481,89 @@
 		    break;
 		}
 	    }
-
+	    return null;
 	}
-	//reshuffling inside the same container - do nothing
-	else if (targetOptionUid.equals(previousOptionUid)) {
 
-	}
 	//moving from one to another
-	else {
-	    for (QbOption targetOption : qbQuestion.getQbOptions()) {
-		if (targetOption.getUid().equals(targetOptionUid)) {
-		    String name = targetOption.getName();
-		    name += "\r\n" + answer;
-		    targetOption.setName(name);
-		    assessmentDao.saveObject(targetOption);
-		    break;
-		}
+	for (QbOption targetOption : qbQuestion.getQbOptions()) {
+	    if (targetOption.getUid().equals(targetOptionUid)) {
+		String name = targetOption.getName();
+		name += "\r\n" + answer;
+		targetOption.setName(name);
+		assessmentDao.saveObject(targetOption);
+		break;
 	    }
+	}
 
-	    for (QbOption previousOption : qbQuestion.getQbOptions()) {
-		if (previousOption.getUid().equals(previousOptionUid)) {
-		    String name = previousOption.getName();
-		    String[] alternatives = name.split("\r\n");
+	for (QbOption previousOption : qbQuestion.getQbOptions()) {
+	    if (previousOption.getUid().equals(previousOptionUid)) {
+		String name = previousOption.getName();
+		String[] alternatives = name.split(",");
 
-		    String nameWithoutUserAnswer = "";
-		    for (String alternative : alternatives) {
-			if (!alternative.equals(answer)) {
-			    nameWithoutUserAnswer += alternative + "\r\n";
-			}
+		StringBuilder nameWithoutUserAnswer = new StringBuilder();
+		for (String alternative : alternatives) {
+		    String normalisedAlternative = AssessmentEscapeUtils.normaliseVSAnswer(alternative);
+		    if (!normalisedAlternative.equals(normalisedAnswer)) {
+			nameWithoutUserAnswer.append(alternative).append("\r\n");
 		    }
-		    if (nameWithoutUserAnswer.length() > 2) {
-			nameWithoutUserAnswer = nameWithoutUserAnswer.substring(0, nameWithoutUserAnswer.length() - 2);
-		    }
-		    previousOption.setName(nameWithoutUserAnswer);
-		    assessmentDao.saveObject(previousOption);
-		    break;
 		}
+		previousOption.setName(nameWithoutUserAnswer.length() > 2
+			? nameWithoutUserAnswer.substring(0, nameWithoutUserAnswer.length() - 2)
+			: "");
+		assessmentDao.saveObject(previousOption);
+		break;
 	    }
 	}
-	assessmentResultDao.flush();
+	return null;
+    }
 
-	//recalculate marks for all lessons in all cases except for reshuffling inside the same container
-	if (!targetOptionUid.equals(previousOptionUid)) {
+    @Override
+    public void recalculateMarksForAllocatedAnswer(Long questionUid, String answer) {
+	AssessmentQuestion assessmentQuestion = assessmentQuestionDao.getByUid(questionUid);
+	QbQuestion qbQuestion = assessmentQuestion.getQbQuestion();
+	// get all finished user results
+	List<AssessmentResult> assessmentResults = assessmentResultDao
+		.getAssessmentResultsByQbQuestionAndAnswer(qbQuestion.getUid(), answer);
+	//stores userId->lastFinishedAssessmentResult
+	Map<Long, AssessmentResult> lastFinishedAssessmentResults = new LinkedHashMap<>();
+	for (AssessmentResult assessmentResult : assessmentResults) {
+	    Long userId = assessmentResult.getUser().getUserId();
+	    lastFinishedAssessmentResults.put(userId, assessmentResult);
+	}
 
-	    // get all finished user results
-	    List<AssessmentResult> assessmentResults = assessmentResultDao
-		    .getAssessmentResultsByQbQuestion(qbQuestion.getUid());
+	for (AssessmentResult assessmentResult : assessmentResults) {
+	    AssessmentUser user = assessmentResult.getUser();
+	    float assessmentMark = assessmentResult.getGrade();
+	    int assessmentMaxMark = assessmentResult.getMaximumGrade();
 
-	    //stores userId->lastFinishedAssessmentResult
-	    Map<Long, AssessmentResult> lastFinishedAssessmentResults = new LinkedHashMap<>();
-	    for (AssessmentResult assessmentResult : assessmentResults) {
-		Long userId = assessmentResult.getUser().getUserId();
-		lastFinishedAssessmentResults.put(userId, assessmentResult);
-	    }
+	    for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) {
+		if (questionResult.getQbQuestion().getUid().equals(qbQuestion.getUid())) {
+		    Float oldQuestionAnswerMark = questionResult.getMark();
+		    int oldResultMaxMark = questionResult.getMaxMark() == null ? 0
+			    : questionResult.getMaxMark().intValue();
 
-	    for (AssessmentResult assessmentResult : assessmentResults) {
-		AssessmentUser user = assessmentResult.getUser();
-		float assessmentMark = assessmentResult.getGrade();
-		int assessmentMaxMark = assessmentResult.getMaximumGrade();
+		    //actually recalculate marks
+		    QuestionDTO questionDto = new QuestionDTO(assessmentQuestion);
+		    questionDto.setMaxMark(oldResultMaxMark);
+		    loadupQuestionResultIntoQuestionDto(questionDto, questionResult);
+		    calculateAnswerMark(assessmentResult.getAssessment().getUid(), user.getUserId(), questionResult,
+			    questionDto);
+		    assessmentQuestionResultDao.saveObject(questionResult);
 
-		for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) {
-		    if (questionResult.getQbQuestion().getUid().equals(qbQuestion.getUid())) {
-			Float oldQuestionAnswerMark = questionResult.getMark();
-			int oldResultMaxMark = questionResult.getMaxMark() == null ? 0
-				: questionResult.getMaxMark().intValue();
-
-			//actually recalculate marks
-			QuestionDTO questionDto = new QuestionDTO(assessmentQuestion);
-			questionDto.setMaxMark(oldResultMaxMark);
-			loadupQuestionResultIntoQuestionDto(questionDto, questionResult);
-			calculateAnswerMark(assessmentResult.getAssessment().getUid(), user.getUserId(), questionResult,
-				questionDto);
-			assessmentQuestionResultDao.saveObject(questionResult);
-
-			float newQuestionAnswerMark = questionResult.getMark();
-			assessmentMark += newQuestionAnswerMark - oldQuestionAnswerMark;
-			break;
-		    }
+		    float newQuestionAnswerMark = questionResult.getMark();
+		    assessmentMark += newQuestionAnswerMark - oldQuestionAnswerMark;
+		    break;
 		}
-
-		// store new mark and maxMark if they were changed
-		AssessmentResult lastFinishedAssessmentResult = lastFinishedAssessmentResults.get(user.getUserId());
-		storeAssessmentResultMarkAndMaxMark(assessmentResult, lastFinishedAssessmentResult, assessmentMark,
-			assessmentMaxMark, user);
 	    }
 
-	    //recalculate marks in all Scratchie activities, that use modified QbQuestion
-	    toolService.recalculateScratchieMarksForVsaQuestion(qbQuestion.getUid());
+	    // store new mark and maxMark if they were changed
+	    AssessmentResult lastFinishedAssessmentResult = lastFinishedAssessmentResults.get(user.getUserId());
+	    storeAssessmentResultMarkAndMaxMark(assessmentResult, lastFinishedAssessmentResult, assessmentMark,
+		    assessmentMaxMark, user);
 	}
 
-	return Optional.empty();
+	//recalculate marks in all Scratchie activities, that use modified QbQuestion
+	toolService.recalculateScratchieMarksForVsaQuestion(qbQuestion.getUid(), answer);
     }
 
     @Override
@@ -1892,7 +1906,10 @@
 			    }
 
 			} else {
-			    userResultRow.addCell(AssessmentEscapeUtils.printResponsesForExcelExport(questionResult));
+			    AssessmentExcelCell assessmentCell = AssessmentEscapeUtils
+				    .addResponseCellForExcelExport(questionResult, false);
+			    userResultRow.addCell(assessmentCell.value,
+				    assessmentCell.isHighlighted ? IndexedColors.GREEN : IndexedColors.AUTOMATIC);
 
 			    if (doSummaryTable) {
 				summaryNACount = updateSummaryCounts(question, questionResult, summaryOfAnswers,
@@ -1951,173 +1968,354 @@
 	    }
 	}
 
+	/*
+	 * ------------------------------------------------------------------
+	 * // -------------- Third tab: User Summary ---------------------------
+	 *
+	 * ExcelSheet userSummarySheet = new ExcelSheet(getMessage("label.export.summary.by.user"));
+	 * sheets.add(userSummarySheet);
+	 *
+	 * // Create the question summary
+	 * ExcelRow userSummaryTitle = userSummarySheet.initRow();
+	 * userSummaryTitle.addCell(getMessage("label.export.user.summary"), true);
+	 *
+	 * ExcelRow summaryRowTitle = userSummarySheet.initRow();
+	 * summaryRowTitle.addCell("#", true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	 * summaryRowTitle.addCell(getMessage("label.monitoring.question.summary.question"), true,
+	 * ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	 * summaryRowTitle.addCell(getMessage("label.authoring.basic.list.header.type"), true,
+	 * ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	 * summaryRowTitle.addCell(getMessage("label.authoring.basic.penalty.factor"), true,
+	 * ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	 * summaryRowTitle.addCell(getMessage("label.monitoring.question.summary.default.mark"), true,
+	 * ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	 * summaryRowTitle.addCell(getMessage("label.monitoring.question.summary.average.mark"), true,
+	 * ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	 *
+	 * Float totalGradesPossible = 0F;
+	 * Float totalAverage = 0F;
+	 * int questionIndex = 1;
+	 * if (assessment.getQuestionReferences() != null) {
+	 * Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
+	 * questionReferences.addAll(assessment.getQuestionReferences());
+	 *
+	 * int randomQuestionsCount = 1;
+	 * for (QuestionReference questionReference : questionReferences) {
+	 *
+	 * String title;
+	 * String questionType;
+	 * Float penaltyFactor;
+	 * Float averageMark = null;
+	 * if (questionReference.isRandomQuestion()) {
+	 *
+	 * title = getMessage("label.authoring.basic.type.random.question") + randomQuestionsCount++;
+	 * questionType = getMessage("label.authoring.basic.type.random.question");
+	 * penaltyFactor = null;
+	 * averageMark = null;
+	 * } else {
+	 *
+	 * AssessmentQuestion question = questionReference.getQuestion();
+	 * title = question.getQbQuestion().getName();
+	 * questionType = AssessmentServiceImpl.getQuestionTypeLanguageLabel(question.getType());
+	 * penaltyFactor = question.getQbQuestion().getPenaltyFactor();
+	 *
+	 * QuestionSummary questionSummary = questionSummaries.get(question.getUid());
+	 * if (questionSummary != null) {
+	 * averageMark = questionSummary.getAverageMark();
+	 * totalAverage += questionSummary.getAverageMark();
+	 * }
+	 * }
+	 *
+	 * int maxGrade = questionReference.getMaxMark();
+	 * totalGradesPossible += maxGrade;
+	 *
+	 * ExcelRow questCellRow = userSummarySheet.initRow();
+	 * questCellRow.addCell(questionIndex++);
+	 * questCellRow.addCell(title);
+	 * questCellRow.addCell(questionType);
+	 * questCellRow.addCell(penaltyFactor);
+	 * questCellRow.addCell(maxGrade);
+	 * questCellRow.addCell(averageMark);
+	 * }
+	 *
+	 * if (totalGradesPossible.floatValue() > 0) {
+	 * ExcelRow totalCellRow = userSummarySheet.initRow();
+	 * totalCellRow.addEmptyCells(2);
+	 * totalCellRow.addCell(getMessage("label.monitoring.summary.total"), true);
+	 * totalCellRow.addCell(totalGradesPossible);
+	 * totalCellRow.addCell(totalAverage);
+	 * }
+	 * userSummarySheet.addEmptyRow();
+	 * }
+	 *
+	 * if (sessionDtos != null) {
+	 * List<AssessmentResult> assessmentResults = assessmentResultDao
+	 * .getLastFinishedAssessmentResults(assessment.getContentId());
+	 * Map<Long, AssessmentResult> userUidToResultMap = new HashMap<>();
+	 * for (AssessmentResult assessmentResult : assessmentResults) {
+	 * userUidToResultMap.put(assessmentResult.getUser().getUid(), assessmentResult);
+	 * }
+	 *
+	 * for (SessionDTO sessionDTO : sessionDtos) {
+	 * userSummarySheet.addEmptyRow();
+	 *
+	 * ExcelRow sessionTitle = userSummarySheet.initRow();
+	 * sessionTitle.addCell(sessionDTO.getSessionName(), true);
+	 *
+	 * AssessmentSession assessmentSession = getSessionBySessionId(sessionDTO.getSessionId());
+	 * Set<AssessmentUser> assessmentUsers = assessmentSession.getAssessmentUsers();
+	 * if (assessmentUsers != null) {
+	 * for (AssessmentUser assessmentUser : assessmentUsers) {
+	 * ExcelRow userTitleRow = userSummarySheet.initRow();
+	 * userTitleRow.addCell(getMessage("label.export.user.id"), true);
+	 * userTitleRow.addCell(getMessage("label.monitoring.user.summary.full.name"), true);
+	 * userTitleRow.addCell(getMessage("label.export.date.attempted"), true);
+	 * userTitleRow.addCell(getMessage("label.monitoring.question.summary.question"), true);
+	 * userTitleRow.addCell(getMessage("label.authoring.basic.option.answer"), true);
+	 * if (assessment.isEnableConfidenceLevels()) {
+	 * userTitleRow.addCell(getMessage("label.confidence"), true);
+	 * }
+	 * userTitleRow.addCell(getMessage("label.export.mark"), true);
+	 *
+	 * if (assessment.isAllowAnswerJustification()) {
+	 * userTitleRow.addCell(getMessage("label.answer.justification"), true);
+	 * }
+	 *
+	 * AssessmentResult assessmentResult = userUidToResultMap.get(assessmentUser.getUid());
+	 * if (assessmentResult != null) {
+	 * Set<AssessmentQuestionResult> questionResults = assessmentResult.getQuestionResults();
+	 * if (questionResults != null) {
+	 * for (AssessmentQuestionResult questionResult : questionResults) {
+	 * ExcelRow userResultRow = userSummarySheet.initRow();
+	 * userResultRow.addCell(assessmentUser.getLoginName());
+	 * userResultRow.addCell(assessmentUser.getFullName());
+	 * userResultRow.addCell(assessmentResult.getStartDate());
+	 * userResultRow.addCell(questionResult.getQbQuestion().getName());
+	 *
+	 * AssessmentEscapeUtils.addResponseCellForExcelExport(questionResult,
+	 * userResultRow, false);
+	 *
+	 * if (assessment.isEnableConfidenceLevels()) {
+	 * String confidenceLevel = null;
+	 *
+	 * switch (assessment.getConfidenceLevelsType()) {
+	 * case 2:
+	 * confidenceLevel = new String[] { getMessage("label.not.confident"),
+	 * getMessage("label.confident"),
+	 * getMessage("label.very.confident") }[questionResult
+	 * .getConfidenceLevel() / 5];
+	 * break;
+	 * case 3:
+	 * confidenceLevel = new String[] { getMessage("label.not.sure"),
+	 * getMessage("label.sure"),
+	 * getMessage("label.very.sure") }[questionResult
+	 * .getConfidenceLevel() / 5];
+	 * break;
+	 * default:
+	 * confidenceLevel = questionResult.getConfidenceLevel() * 10 + "%";
+	 * }
+	 *
+	 * userResultRow.addCell(confidenceLevel);
+	 * }
+	 *
+	 * userResultRow.addCell(questionResult.getMark());
+	 *
+	 * if (assessment.isAllowAnswerJustification()) {
+	 * userResultRow.addCell(AssessmentEscapeUtils
+	 * .escapeStringForExcelExport(questionResult.getJustification()));
+	 * }
+	 * }
+	 * }
+	 *
+	 * ExcelRow userTotalRow = userSummarySheet.initRow();
+	 * userTotalRow.addEmptyCells(assessment.isEnableConfidenceLevels() ? 5 : 4);
+	 * userTotalRow.addCell(getMessage("label.monitoring.summary.total"), true);
+	 * userTotalRow.addCell(assessmentResult.getGrade());
+	 * userSummarySheet.addEmptyRow();
+	 * }
+	 * }
+	 * }
+	 * }
+	 * }
+	 */
+
 	// ------------------------------------------------------------------
-	// -------------- Third tab: User Summary ---------------------------
+	// -------------- Third tab: Learner summary ---------------------------
 
 	ExcelSheet userSummarySheet = new ExcelSheet(getMessage("label.export.summary.by.user"));
 	sheets.add(userSummarySheet);
 
-	// Create the question summary
-	ExcelRow userSummaryTitle = userSummarySheet.initRow();
-	userSummaryTitle.addCell(getMessage("label.export.user.summary"), true);
+	if (sessionDtos != null && assessment.getQuestionReferences() != null) {
+	    // if there are multiple session, then the activity has to be grouped
+	    boolean isActivityGrouped = sessionDtos.size() > 1;
 
-	ExcelRow summaryRowTitle = userSummarySheet.initRow();
-	summaryRowTitle.addCell("#", true, ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle.addCell(getMessage("label.monitoring.question.summary.question"), true,
-		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle.addCell(getMessage("label.authoring.basic.list.header.type"), true,
-		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle.addCell(getMessage("label.authoring.basic.penalty.factor"), true,
-		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle.addCell(getMessage("label.monitoring.question.summary.default.mark"), true,
-		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
-	summaryRowTitle.addCell(getMessage("label.monitoring.question.summary.average.mark"), true,
-		ExcelCell.BORDER_STYLE_BOTTOM_THIN);
+	    // Row with just "Questions" header
+	    ExcelRow userSummaryTitle = userSummarySheet.initRow();
+	    // if there is no grouping, then we skip "Group" column
+	    int questionLeftPadding = isActivityGrouped ? 3 : 2;
+	    userSummaryTitle.addEmptyCells(questionLeftPadding);
+	    userSummaryTitle.addCell(getMessage("label.export.questions"), true, ExcelCell.BORDER_STYLE_LEFT_THIN);
 
-	Float totalGradesPossible = 0F;
-	Float totalAverage = 0F;
-	int questionIndex = 1;
-	if (assessment.getQuestionReferences() != null) {
+	    // Row with question titles
+	    ExcelRow questionTitlesRow = userSummarySheet.initRow();
+	    questionTitlesRow.addEmptyCells(questionLeftPadding);
+
 	    Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
 	    questionReferences.addAll(assessment.getQuestionReferences());
 
-	    int randomQuestionsCount = 1;
+	    int questionCounter = 1;
+	    // print out all question titles
 	    for (QuestionReference questionReference : questionReferences) {
+		AssessmentQuestion question = questionReference.getQuestion();
+		String title = question.getQbQuestion().getName();
+		// leave pure text of title
+		title = WebUtil.removeHTMLtags(title).strip();
+		// add question numbering in front of title
+		title = questionCounter + ". " + title;
+		questionCounter++;
 
-		String title;
-		String questionType;
-		Float penaltyFactor;
-		Float averageMark = null;
-		if (questionReference.isRandomQuestion()) {
+		// shorten long title
+		if (title.length() > 80) {
+		    title = title.substring(0, 80) + "...";
+		}
+		questionTitlesRow.addCell(title, true, ExcelCell.BORDER_STYLE_LEFT_THIN);
 
-		    title = getMessage("label.authoring.basic.type.random.question") + randomQuestionsCount++;
-		    questionType = getMessage("label.authoring.basic.type.random.question");
-		    penaltyFactor = null;
-		    averageMark = null;
-		} else {
-
-		    AssessmentQuestion question = questionReference.getQuestion();
-		    title = question.getQbQuestion().getName();
-		    questionType = AssessmentServiceImpl.getQuestionTypeLanguageLabel(question.getType());
-		    penaltyFactor = question.getQbQuestion().getPenaltyFactor();
-
-		    QuestionSummary questionSummary = questionSummaries.get(question.getUid());
-		    if (questionSummary != null) {
-			averageMark = questionSummary.getAverageMark();
-			totalAverage += questionSummary.getAverageMark();
-		    }
+		int columnShift = 1;
+		// currently only MCQ and True/False questions have learner interaction logged
+		// for other question types, do not include the column
+		boolean addAnsweredDateColumn = QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType()
+			|| QbQuestion.TYPE_TRUE_FALSE == question.getType();
+		if (addAnsweredDateColumn) {
+		    columnShift++;
 		}
+		if (assessment.isEnableConfidenceLevels()) {
+		    columnShift++;
+		}
+		questionTitlesRow.addEmptyCells(columnShift);
+		userSummarySheet.addMergedCells(5, questionLeftPadding, questionLeftPadding + columnShift);
 
-		int maxGrade = questionReference.getMaxMark();
-		totalGradesPossible += maxGrade;
+		questionLeftPadding += columnShift + 1;
+	    }
+	    questionTitlesRow.addCell("", ExcelCell.BORDER_STYLE_LEFT_THIN);
 
-		ExcelRow questCellRow = userSummarySheet.initRow();
-		questCellRow.addCell(questionIndex++);
-		questCellRow.addCell(title);
-		questCellRow.addCell(questionType);
-		questCellRow.addCell(penaltyFactor);
-		questCellRow.addCell(maxGrade);
-		questCellRow.addCell(averageMark);
+	    // Row with column header below question titles
+	    ExcelRow userSummaryUserHeadersRow = userSummarySheet.initRow();
+	    if (isActivityGrouped) {
+		userSummaryUserHeadersRow.addCell(getMessage("label.export.group"), true);
 	    }
+	    userSummaryUserHeadersRow.addCell(getMessage("label.export.user.id"), true);
+	    userSummaryUserHeadersRow.addCell(getMessage("label.monitoring.user.summary.full.name"), true);
 
-	    if (totalGradesPossible.floatValue() > 0) {
-		ExcelRow totalCellRow = userSummarySheet.initRow();
-		totalCellRow.addEmptyCells(2);
-		totalCellRow.addCell(getMessage("label.monitoring.summary.total"), true);
-		totalCellRow.addCell(totalGradesPossible);
-		totalCellRow.addCell(totalAverage);
+	    for (QuestionReference questionReference : questionReferences) {
+		userSummaryUserHeadersRow.addCell(getMessage("label.export.mark"), ExcelCell.BORDER_STYLE_LEFT_THIN);
+		userSummaryUserHeadersRow.addCell(getMessage("label.authoring.basic.option.answer"));
+
+		AssessmentQuestion question = questionReference.getQuestion();
+		boolean addAnsweredDateColumn = QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType()
+			|| QbQuestion.TYPE_TRUE_FALSE == question.getType();
+		if (addAnsweredDateColumn) {
+		    userSummaryUserHeadersRow.addCell(getMessage("monitor.summary.after.date"));
+		}
+		if (assessment.isEnableConfidenceLevels()) {
+		    userSummaryUserHeadersRow.addCell(getMessage("label.confidence"));
+		}
 	    }
-	    userSummarySheet.addEmptyRow();
-	}
 
-	if (sessionDtos != null) {
+	    // a single column at the end of previous headers
+	    userSummaryUserHeadersRow.addCell(getMessage("label.monitoring.summary.total"),
+		    ExcelCell.BORDER_STYLE_LEFT_THIN);
+
 	    List<AssessmentResult> assessmentResults = assessmentResultDao
 		    .getLastFinishedAssessmentResults(assessment.getContentId());
-	    Map<Long, AssessmentResult> userUidToResultMap = new HashMap<>();
-	    for (AssessmentResult assessmentResult : assessmentResults) {
-		userUidToResultMap.put(assessmentResult.getUser().getUid(), assessmentResult);
-	    }
+	    Map<Long, AssessmentResult> userUidToResultMap = assessmentResults.stream()
+		    .collect(Collectors.toMap(r -> r.getUser().getUid(), r -> r));
 
 	    for (SessionDTO sessionDTO : sessionDtos) {
-		userSummarySheet.addEmptyRow();
-
-		ExcelRow sessionTitle = userSummarySheet.initRow();
-		sessionTitle.addCell(sessionDTO.getSessionName(), true);
-
 		AssessmentSession assessmentSession = getSessionBySessionId(sessionDTO.getSessionId());
 		Set<AssessmentUser> assessmentUsers = assessmentSession.getAssessmentUsers();
-		if (assessmentUsers != null) {
-		    for (AssessmentUser assessmentUser : assessmentUsers) {
-			ExcelRow userTitleRow = userSummarySheet.initRow();
-			userTitleRow.addCell(getMessage("label.export.user.id"), true);
-			userTitleRow.addCell(getMessage("label.monitoring.user.summary.full.name"), true);
-			userTitleRow.addCell(getMessage("label.export.date.attempted"), true);
-			userTitleRow.addCell(getMessage("label.monitoring.question.summary.question"), true);
-			userTitleRow.addCell(getMessage("label.authoring.basic.option.answer"), true);
-			if (assessment.isEnableConfidenceLevels()) {
-			    userTitleRow.addCell(getMessage("label.confidence"), true);
-			}
-			userTitleRow.addCell(getMessage("label.export.mark"), true);
+		for (AssessmentUser assessmentUser : assessmentUsers) {
+		    ExcelRow userResultRow = userSummarySheet.initRow();
+		    if (isActivityGrouped) {
+			userResultRow.addCell(sessionDTO.getSessionName());
+		    }
+		    userResultRow.addCell(assessmentUser.getLoginName());
+		    userResultRow.addCell(assessmentUser.getFullName());
 
-			if (assessment.isAllowAnswerJustification()) {
-			    userTitleRow.addCell(getMessage("label.answer.justification"), true);
-			}
+		    AssessmentResult assessmentResult = userUidToResultMap.get(assessmentUser.getUid());
+		    if (assessmentResult == null) {
+			continue;
+		    }
 
-			AssessmentResult assessmentResult = userUidToResultMap.get(assessmentUser.getUid());
-			if (assessmentResult != null) {
-			    Set<AssessmentQuestionResult> questionResults = assessmentResult.getQuestionResults();
-			    if (questionResults != null) {
-				for (AssessmentQuestionResult questionResult : questionResults) {
-				    ExcelRow userResultRow = userSummarySheet.initRow();
-				    userResultRow.addCell(assessmentUser.getLoginName());
-				    userResultRow.addCell(assessmentUser.getFullName());
-				    userResultRow.addCell(assessmentResult.getStartDate());
-				    userResultRow.addCell(questionResult.getQbQuestion().getName());
-				    userResultRow.addCell(
-					    AssessmentEscapeUtils.printResponsesForExcelExport(questionResult));
-				    if (assessment.isEnableConfidenceLevels()) {
-					String confidenceLevel = null;
+		    Set<AssessmentQuestionResult> questionResults = assessmentResult.getQuestionResults();
+		    if (questionResults == null || questionResults.isEmpty()) {
+			continue;
+		    }
+		    Map<Long, AssessmentQuestionResult> questionResultsMap = questionResults.stream().collect(Collectors
+			    .toMap(questionResult -> questionResult.getQbToolQuestion().getUid(), Function.identity()));
 
-					switch (assessment.getConfidenceLevelsType()) {
-					    case 2:
-						confidenceLevel = new String[] { getMessage("label.not.confident"),
-							getMessage("label.confident"),
-							getMessage("label.very.confident") }[questionResult
-								.getConfidenceLevel() / 5];
-						break;
-					    case 3:
-						confidenceLevel = new String[] { getMessage("label.not.sure"),
-							getMessage("label.sure"),
-							getMessage("label.very.sure") }[questionResult
-								.getConfidenceLevel() / 5];
-						break;
-					    default:
-						confidenceLevel = questionResult.getConfidenceLevel() * 10 + "%";
-					}
+		    // get information when a learner started interaction with given questions
+		    Map<Long, LearnerInteractionEvent> learnerInteractions = learnerInteractionService
+			    .getFirstLearnerInteractions(assessment.getContentId(),
+				    assessmentUser.getUserId().intValue());
 
-					userResultRow.addCell(confidenceLevel);
-				    }
+		    // follow question reference ordering, to QbToolQuestion's
+		    for (QuestionReference questionReference : questionReferences) {
+			AssessmentQuestionResult questionResult = questionResultsMap
+				.get(questionReference.getQuestion().getUid());
+			// mark
+			userResultRow.addCell(questionResult.getMark(), ExcelCell.BORDER_STYLE_LEFT_THIN);
 
-				    userResultRow.addCell(questionResult.getMark());
+			// option chosen or full answer
+			AssessmentExcelCell assessmentCell = AssessmentEscapeUtils
+				.addResponseCellForExcelExport(questionResult, true);
+			userResultRow.addCell(assessmentCell.value,
+				assessmentCell.isHighlighted ? IndexedColors.GREEN : IndexedColors.AUTOMATIC);
 
-				    if (assessment.isAllowAnswerJustification()) {
-					userResultRow.addCell(AssessmentEscapeUtils
-						.escapeStringForExcelExport(questionResult.getJustification()));
-				    }
-				}
+			// learner interaction
+			QbQuestion question = questionResult.getQbQuestion();
+			boolean addAnsweredDateColumn = QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType()
+				|| QbQuestion.TYPE_TRUE_FALSE == question.getType();
+			if (addAnsweredDateColumn) {
+			    // only put interaction time into sheet if auto submit picked up answer
+			    LearnerInteractionEvent interaction = assessmentCell.value == null ? null
+				    : learnerInteractions.get(questionResult.getQbToolQuestion().getUid());
+			    if (interaction == null) {
+				userResultRow.addEmptyCell();
+			    } else {
+				userResultRow.addCell(interaction.getFormattedDate());
 			    }
+			}
 
-			    ExcelRow userTotalRow = userSummarySheet.initRow();
-			    userTotalRow.addEmptyCells(assessment.isEnableConfidenceLevels() ? 5 : 4);
-			    userTotalRow.addCell(getMessage("label.monitoring.summary.total"), true);
-			    userTotalRow.addCell(assessmentResult.getGrade());
-			    userSummarySheet.addEmptyRow();
+			// confidence level
+			if (assessment.isEnableConfidenceLevels()) {
+			    String confidenceLevel = null;
+
+			    switch (assessment.getConfidenceLevelsType()) {
+				case 2:
+				    confidenceLevel = new String[] { getMessage("label.not.confident"),
+					    getMessage("label.confident"),
+					    getMessage("label.very.confident") }[questionResult.getConfidenceLevel()
+						    / 5];
+				    break;
+				case 3:
+				    confidenceLevel = new String[] { getMessage("label.not.sure"),
+					    getMessage("label.sure"),
+					    getMessage("label.very.sure") }[questionResult.getConfidenceLevel() / 5];
+				    break;
+				default:
+				    confidenceLevel = questionResult.getConfidenceLevel() * 10 + "%";
+			    }
+
+			    userResultRow.addCell(confidenceLevel);
 			}
 		    }
+		    userResultRow.addCell(assessmentResult.getGrade(), ExcelCell.BORDER_STYLE_LEFT_THIN);
 		}
+
+		userSummarySheet.addEmptyRow();
+		userSummarySheet.addEmptyRow();
 	    }
 	}
-
 	return sheets;
     }
 
@@ -3090,7 +3288,8 @@
     }
 
     @Override
-    public void replaceQuestions(long toolContentId, String newActivityName, List<QbQuestion> newQuestions) {
+    public List<QbToolQuestion> replaceQuestions(long toolContentId, String newActivityName,
+	    List<QbQuestion> newQuestions) {
 	Assessment assessment = getAssessmentByContentId(toolContentId);
 	if (newActivityName != null) {
 	    assessment.setTitle(newActivityName);
@@ -3110,15 +3309,17 @@
 	// this is needed, otherwise Hibernate wants to re-save the deleted Assessment questions
 	assessment.getQuestions().clear();
 
+	List<QbToolQuestion> result = new ArrayList<>(newQuestions.size());
 	// populate Assessment with new questions and references
 	int displayOrder = 1;
 	for (QbQuestion qbQuestion : newQuestions) {
 	    AssessmentQuestion assessmentQuestion = new AssessmentQuestion();
-	    assessmentQuestion.setDisplayOrder(displayOrder++);
+	    assessmentQuestion.setDisplayOrder(displayOrder);
 	    assessmentQuestion.setQbQuestion(qbQuestion);
 	    assessmentQuestion.setToolContentId(toolContentId);
 	    assessmentQuestionDao.insert(assessmentQuestion);
 	    assessment.getQuestions().add(assessmentQuestion);
+	    result.add(assessmentQuestion);
 
 	    QuestionReference questionReference = new QuestionReference();
 	    questionReference.setQuestion(assessmentQuestion);
@@ -3129,7 +3330,24 @@
 	    displayOrder++;
 	}
 	assessmentDao.update(assessment);
+
+	return result;
     }
+
+    @Override
+    public void replaceQuestion(long toolContentId, long oldQbQuestionUid, long newQbQuestionUid) {
+	Assessment assessment = getAssessmentByContentId(toolContentId);
+	QbQuestion newQbQuestion = null;
+	for (AssessmentQuestion assessmentQuestion : assessment.getQuestions()) {
+	    if (assessmentQuestion.getQbQuestion().getUid().equals(oldQbQuestionUid)) {
+		if (newQbQuestion == null) {
+		    newQbQuestion = qbService.getQuestionByUid(newQbQuestionUid);
+		}
+		assessmentQuestion.setQbQuestion(newQbQuestion);
+	    }
+	}
+    }
+
     // *****************************************************************************
     // private methods
     // *****************************************************************************
@@ -3226,6 +3444,9 @@
 	for (AssessmentQuestion assessmentQuestion : toolContentObj.getQuestions()) {
 	    qbService.prepareQuestionForExport(assessmentQuestion.getQbQuestion());
 	}
+	// do not export time limits if the LD gets exported from a running sequence
+	toolContentObj.setTimeLimitAdjustments(null);
+	toolContentObj.setAbsoluteTimeLimit(null);
 
 	try {
 	    exportContentService.exportToolContent(toolContentId, toolContentObj, assessmentToolContentHandler,
@@ -3720,6 +3941,10 @@
 	this.qbService = qbService;
     }
 
+    public void setOutcomeService(IOutcomeService outcomeService) {
+	this.outcomeService = outcomeService;
+    }
+
     public AssessmentOutputFactory getAssessmentOutputFactory() {
 	return assessmentOutputFactory;
     }
@@ -3728,6 +3953,10 @@
 	this.assessmentOutputFactory = assessmentOutputFactory;
     }
 
+    public void setLearnerInteractionService(ILearnerInteractionService learnerInteractionService) {
+	this.learnerInteractionService = learnerInteractionService;
+    }
+
     @Override
     public Class<?>[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getAssessmentOutputFactory().getSupportedDefinitionClasses(definitionType);
@@ -3784,6 +4013,7 @@
      *
      * @throws IOException
      */
+    @SuppressWarnings("unchecked")
     @Override
     public void createRestToolContent(Integer userID, Long toolContentID, ObjectNode toolContentJSON)
 	    throws IOException {
@@ -3850,174 +4080,215 @@
 	}
 	assessment.setCreatedBy(assessmentUser);
 
-	// **************************** Set the question bank *********************
-	QbCollection collection = qbService.getUserPrivateCollection(userID);
-	Set<String> collectionUUIDs = collection == null ? new HashSet<>()
-		: qbService.getCollectionQuestions(collection.getUid()).stream().filter(q -> q.getUuid() != null)
-			.collect(Collectors.mapping(q -> q.getUuid().toString(), Collectors.toSet()));
 	ArrayNode questions = JsonUtil.optArray(toolContentJSON, "questions");
 	Set<AssessmentQuestion> newQuestionSet = assessment.getQuestions(); // the Assessment constructor will set up the collection
-	for (JsonNode questionJSONData : questions) {
 
-	    boolean addToCollection = collection != null;
+	if (questions != null) {
 
-	    AssessmentQuestion question = new AssessmentQuestion();
-	    Integer type = JsonUtil.optInt(questionJSONData, "type");
-	    question.setToolContentId(toolContentID);
-	    question.setDisplayOrder(JsonUtil.optInt(questionJSONData, RestTags.DISPLAY_ORDER));
-	    question.setAnswerRequired(JsonUtil.optBoolean(questionJSONData, "answerRequired", Boolean.FALSE));
+	    QbCollection collection = null;
+	    Set<String> collectionUUIDs = null;
 
-	    QbQuestion oldQbQuestion = null;
-	    QbQuestion qbQuestion = null;
-	    String uuid = JsonUtil.optString(questionJSONData, RestTags.QUESTION_UUID);
+	    for (JsonNode questionJSONData : questions) {
+		AssessmentQuestion question = new AssessmentQuestion();
+		Integer type = JsonUtil.optInt(questionJSONData, "type");
+		question.setToolContentId(toolContentID);
+		question.setDisplayOrder(JsonUtil.optInt(questionJSONData, RestTags.DISPLAY_ORDER));
+		question.setAnswerRequired(JsonUtil.optBoolean(questionJSONData, "answerRequired", Boolean.FALSE));
 
-	    // try to match the question to an existing QB question in DB
-	    if (StringUtils.isNotBlank(uuid)) {
-		oldQbQuestion = qbService.getQuestionByUUID(UUID.fromString(uuid));
-	    }
-	    boolean isModification = oldQbQuestion != null;
+		QbQuestion oldQbQuestion = null;
+		QbQuestion qbQuestion = null;
+		String uuid = JsonUtil.optString(questionJSONData, RestTags.QUESTION_UUID);
 
-	    // are we modifying an existing question or creating a new one
-	    if (isModification) {
-		qbQuestion = oldQbQuestion.clone();
-		qbService.releaseFromCache(oldQbQuestion);
-	    } else {
-		qbQuestion = new QbQuestion();
-		qbQuestion.setQuestionId(qbService.generateNextQuestionId());
-		qbQuestion.setContentFolderId(FileUtil.generateUniqueContentFolderID());
-	    }
+		// try to match the question to an existing QB question in DB
+		if (StringUtils.isNotBlank(uuid)) {
+		    oldQbQuestion = qbService.getQuestionByUUID(UUID.fromString(uuid));
+		}
+		boolean isModification = oldQbQuestion != null;
 
-	    qbQuestion.setType(type);
-	    qbQuestion.setName(JsonUtil.optString(questionJSONData, RestTags.QUESTION_TITLE));
-	    qbQuestion.setDescription(JsonUtil.optString(questionJSONData, RestTags.QUESTION_TEXT));
+		// are we modifying an existing question or creating a new one
+		if (isModification) {
+		    qbQuestion = oldQbQuestion.clone();
+		    qbService.releaseFromCache(oldQbQuestion);
+		} else {
+		    qbQuestion = new QbQuestion();
+		    qbQuestion.setQuestionId(qbService.generateNextQuestionId());
+		    qbQuestion.setContentFolderId(FileUtil.generateUniqueContentFolderID());
+		}
 
-	    qbQuestion.setAllowRichEditor(
-		    JsonUtil.optBoolean(questionJSONData, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
-	    qbQuestion.setCaseSensitive(JsonUtil.optBoolean(questionJSONData, "caseSensitive", Boolean.FALSE));
-	    qbQuestion.setCorrectAnswer(JsonUtil.optBoolean(questionJSONData, "correctAnswer", Boolean.FALSE));
-	    qbQuestion.setMaxMark(JsonUtil.optInt(questionJSONData, "defaultGrade", 1));
-	    qbQuestion.setFeedback(JsonUtil.optString(questionJSONData, "feedback"));
-	    qbQuestion.setFeedbackOnCorrect(JsonUtil.optString(questionJSONData, "feedbackOnCorrect"));
-	    qbQuestion.setFeedbackOnIncorrect(JsonUtil.optString(questionJSONData, "feedbackOnIncorrect"));
-	    qbQuestion
-		    .setFeedbackOnPartiallyCorrect(JsonUtil.optString(questionJSONData, "feedbackOnPartiallyCorrect"));
-	    qbQuestion.setMaxWordsLimit(JsonUtil.optInt(questionJSONData, "maxWordsLimit", 0));
-	    qbQuestion.setMinWordsLimit(JsonUtil.optInt(questionJSONData, "minWordsLimit", 0));
-	    qbQuestion.setMultipleAnswersAllowed(
-		    JsonUtil.optBoolean(questionJSONData, "multipleAnswersAllowed", Boolean.FALSE));
-	    qbQuestion.setIncorrectAnswerNullifiesMark(
-		    JsonUtil.optBoolean(questionJSONData, "incorrectAnswerNullifiesMark", Boolean.FALSE));
-	    qbQuestion.setPenaltyFactor(JsonUtil.optDouble(questionJSONData, "penaltyFactor", 0.0).floatValue());
+		qbQuestion.setType(type);
+		qbQuestion.setName(JsonUtil.optString(questionJSONData, RestTags.QUESTION_TITLE));
+		qbQuestion.setDescription(JsonUtil.optString(questionJSONData, RestTags.QUESTION_TEXT));
 
-	    if (!isModification) {
-		// UUID normally gets generated in the DB, but we need it immediately,
-		// so we generate it programmatically.
-		// Re-reading the QbQuestion we just saved does not help as it is read from Hibernate cache,
-		// not from DB where UUID is filed
-		qbQuestion.setUuid(UUID.randomUUID());
-		assessmentDao.insert(qbQuestion);
-	    }
+		qbQuestion.setAllowRichEditor(
+			JsonUtil.optBoolean(questionJSONData, RestTags.ALLOW_RICH_TEXT_EDITOR, Boolean.FALSE));
+		qbQuestion.setCaseSensitive(JsonUtil.optBoolean(questionJSONData, "caseSensitive", Boolean.FALSE));
+		qbQuestion.setCorrectAnswer(JsonUtil.optBoolean(questionJSONData, "correctAnswer", Boolean.FALSE));
+		qbQuestion.setMaxMark(JsonUtil.optInt(questionJSONData, "defaultGrade", 1));
+		qbQuestion.setFeedback(JsonUtil.optString(questionJSONData, "feedback"));
+		qbQuestion.setFeedbackOnCorrect(JsonUtil.optString(questionJSONData, "feedbackOnCorrect"));
+		qbQuestion.setFeedbackOnIncorrect(JsonUtil.optString(questionJSONData, "feedbackOnIncorrect"));
+		qbQuestion.setFeedbackOnPartiallyCorrect(
+			JsonUtil.optString(questionJSONData, "feedbackOnPartiallyCorrect"));
+		qbQuestion.setMaxWordsLimit(JsonUtil.optInt(questionJSONData, "maxWordsLimit", 0));
+		qbQuestion.setMinWordsLimit(JsonUtil.optInt(questionJSONData, "minWordsLimit", 0));
+		qbQuestion.setMultipleAnswersAllowed(
+			JsonUtil.optBoolean(questionJSONData, "multipleAnswersAllowed", Boolean.FALSE));
+		qbQuestion.setIncorrectAnswerNullifiesMark(
+			JsonUtil.optBoolean(questionJSONData, "incorrectAnswerNullifiesMark", Boolean.FALSE));
+		qbQuestion.setPenaltyFactor(JsonUtil.optDouble(questionJSONData, "penaltyFactor", 0.0).floatValue());
 
-	    if ((type == QbQuestion.TYPE_MATCHING_PAIRS) || (type == QbQuestion.TYPE_MULTIPLE_CHOICE)
-		    || (type == QbQuestion.TYPE_NUMERICAL) || (type == QbQuestion.TYPE_MARK_HEDGING)) {
-
-		if (!questionJSONData.has(RestTags.ANSWERS)) {
-		    throw new IOException("REST Authoring is missing answers for a question of type " + type + ". Data:"
-			    + toolContentJSON);
+		if (!isModification) {
+		    // UUID normally gets generated in the DB, but we need it immediately,
+		    // so we generate it programmatically.
+		    // Re-reading the QbQuestion we just saved does not help as it is read from Hibernate cache,
+		    // not from DB where UUID is filed
+		    qbQuestion.setUuid(UUID.randomUUID());
+		    assessmentDao.insert(qbQuestion);
 		}
 
-		List<QbOption> optionList = new ArrayList<>();
-		ArrayNode optionsData = JsonUtil.optArray(questionJSONData, RestTags.ANSWERS);
-		for (JsonNode answerData : optionsData) {
-		    int displayOrder = JsonUtil.optInt(answerData, RestTags.DISPLAY_ORDER);
-		    QbOption option = null;
-		    // check if existing question gets modified or do we create a new one
-		    for (QbOption existingOption : qbQuestion.getQbOptions()) {
-			if (existingOption.getDisplayOrder() == displayOrder) {
-			    option = existingOption;
-			    break;
+		if ((type == QbQuestion.TYPE_MATCHING_PAIRS) || (type == QbQuestion.TYPE_MULTIPLE_CHOICE)
+			|| (type == QbQuestion.TYPE_NUMERICAL) || (type == QbQuestion.TYPE_MARK_HEDGING)) {
+
+		    if (!questionJSONData.has(RestTags.ANSWERS)) {
+			throw new IOException("REST Authoring is missing answers for a question of type " + type
+				+ ". Data:" + toolContentJSON);
+		    }
+
+		    List<QbOption> optionList = new ArrayList<>();
+		    ArrayNode optionsData = JsonUtil.optArray(questionJSONData, RestTags.ANSWERS);
+		    for (JsonNode answerData : optionsData) {
+			int displayOrder = JsonUtil.optInt(answerData, RestTags.DISPLAY_ORDER);
+			QbOption option = null;
+			// check if existing question gets modified or do we create a new one
+			for (QbOption existingOption : qbQuestion.getQbOptions()) {
+			    if (existingOption.getDisplayOrder() == displayOrder) {
+				option = existingOption;
+				break;
+			    }
 			}
+			if (option == null) {
+			    option = new QbOption();
+			    option.setDisplayOrder(displayOrder);
+			    option.setQbQuestion(qbQuestion);
+			}
+
+			Boolean correct = JsonUtil.optBoolean(answerData, RestTags.CORRECT, null);
+			if (correct == null) {
+			    Double grade = JsonUtil.optDouble(answerData, "grade");
+			    option.setMaxMark(grade == null ? 0 : grade.floatValue());
+			} else {
+			    option.setMaxMark(correct ? 1 : 0);
+			}
+			option.setAcceptedError(JsonUtil.optDouble(answerData, "acceptedError", 0.0).floatValue());
+			option.setFeedback(JsonUtil.optString(answerData, "feedback"));
+			option.setName(JsonUtil.optString(answerData, RestTags.ANSWER_TEXT));
+			option.setNumericalOption(JsonUtil.optDouble(answerData, "answerFloat", 0.0).floatValue());
+			// option.setQuestion(question); can't find the use for this field yet!
+			optionList.add(option);
 		    }
-		    if (option == null) {
-			option = new QbOption();
-			option.setDisplayOrder(displayOrder);
-			option.setQbQuestion(qbQuestion);
-		    }
+		    qbQuestion.setQbOptions(optionList);
+		}
 
-		    Boolean correct = JsonUtil.optBoolean(answerData, RestTags.CORRECT, null);
-		    if (correct == null) {
-			Double grade = JsonUtil.optDouble(answerData, "grade");
-			option.setMaxMark(grade == null ? 0 : grade.floatValue());
-		    } else {
-			option.setMaxMark(correct ? 1 : 0);
+		Long collectionUid = JsonUtil.optLong(questionJSONData, RestTags.COLLECTION_UID);
+		boolean addToCollection = collectionUid != null;
+		if (addToCollection) {
+		    // check if it is the same collection - there is a good chance it is
+		    if (collection == null || collectionUid != collection.getUid()) {
+			collection = qbService.getCollection(collectionUid);
+			if (collection == null) {
+			    addToCollection = false;
+			} else {
+			    collectionUUIDs = qbService.getCollectionQuestions(collection.getUid()).stream()
+				    .filter(q -> q.getUuid() != null)
+				    .collect(Collectors.mapping(q -> q.getUuid().toString(), Collectors.toSet()));
+			}
 		    }
-		    option.setAcceptedError(JsonUtil.optDouble(answerData, "acceptedError", 0.0).floatValue());
-		    option.setFeedback(JsonUtil.optString(answerData, "feedback"));
-		    option.setName(JsonUtil.optString(answerData, RestTags.ANSWER_TEXT));
-		    option.setNumericalOption(JsonUtil.optDouble(answerData, "answerFloat", 0.0).floatValue());
-		    // option.setQuestion(question); can't find the use for this field yet!
-		    optionList.add(option);
 		}
-		qbQuestion.setQbOptions(optionList);
-	    }
 
-	    if (isModification) {
-		addToCollection &= !collectionUUIDs.contains(uuid);
+		if (isModification) {
+		    if (collectionUUIDs != null) {
+			addToCollection &= !collectionUUIDs.contains(uuid);
+		    }
 
-		int isModified = qbQuestion.isQbQuestionModified(oldQbQuestion);
-		if (isModified == IQbService.QUESTION_MODIFIED_VERSION_BUMP) {
-		    qbQuestion.clearID();
-		    qbQuestion.setVersion(qbService.getMaxQuestionVersion(qbQuestion.getQuestionId()) + 1);
-		    qbQuestion.setCreateDate(new Date());
-		    qbQuestion.setUuid(UUID.randomUUID());
-		    assessmentDao.insert(qbQuestion);
-		} else if (isModified == IQbService.QUESTION_MODIFIED_NONE) {
-		    // Changes to question and option content does not count as version bump,
-		    // but rather as update of the original question
-		    // They should probably be marked as "update" rather than "none"
-		    assessmentDao.update(qbQuestion);
+		    int isModified = qbQuestion.isQbQuestionModified(oldQbQuestion);
+		    if (isModified == IQbService.QUESTION_MODIFIED_VERSION_BUMP) {
+			qbQuestion.clearID();
+			qbQuestion.setVersion(qbService.getMaxQuestionVersion(qbQuestion.getQuestionId()) + 1);
+			qbQuestion.setCreateDate(new Date());
+			qbQuestion.setUuid(UUID.randomUUID());
+			assessmentDao.insert(qbQuestion);
+		    } else if (isModified == IQbService.QUESTION_MODIFIED_NONE) {
+			// Changes to question and option content does not count as version bump,
+			// but rather as update of the original question
+			// They should probably be marked as "update" rather than "none"
+			assessmentDao.update(qbQuestion);
+		    } else {
+			throw new IllegalArgumentException(
+				"Implement other Question Bank modification levels in Assessment tool");
+		    }
 		} else {
-		    throw new IllegalArgumentException(
-			    "Implement other Question Bank modification levels in Assessment tool");
+		    // only process learning outcomes when this is not a modification, i.e. it is a new question
+		    ArrayNode learningOutcomesJSON = JsonUtil.optArray(questionJSONData, RestTags.LEARNING_OUTCOMES);
+		    if (learningOutcomesJSON != null && learningOutcomesJSON.size() > 0) {
+			for (JsonNode learningOutcomeJSON : learningOutcomesJSON) {
+			    String learningOutcomeText = learningOutcomeJSON.asText();
+			    learningOutcomeText = learningOutcomeText.strip();
+			    List<Outcome> learningOutcomes = userManagementService.findByProperty(Outcome.class, "name",
+				    learningOutcomeText);
+			    Outcome learningOutcome = null;
+			    if (learningOutcomes.isEmpty()) {
+				learningOutcome = outcomeService.createOutcome(learningOutcomeText, userID);
+			    } else {
+				learningOutcome = learningOutcomes.get(0);
+			    }
+
+			    OutcomeMapping outcomeMapping = new OutcomeMapping();
+			    outcomeMapping.setOutcome(learningOutcome);
+			    outcomeMapping.setQbQuestionId(qbQuestion.getQuestionId());
+			    userManagementService.save(outcomeMapping);
+			}
+		    }
 		}
-	    }
 
-	    // Store it back into JSON so Scratchie can read it
-	    // and use the same questions, not create new ones
-	    uuid = qbQuestion.getUuid().toString();
-	    ObjectNode questionData = (ObjectNode) questionJSONData;
-	    questionData.put(RestTags.QUESTION_UUID, uuid);
+		// Store it back into JSON so Scratchie can read it
+		// and use the same questions, not create new ones
+		uuid = qbQuestion.getUuid().toString();
+		ObjectNode questionData = (ObjectNode) questionJSONData;
+		questionData.put(RestTags.QUESTION_UUID, uuid);
 
-	    // question.setUnits(units); Needed for numerical type question
-	    question.setQbQuestion(qbQuestion);
-	    checkType(question.getType());
-	    newQuestionSet.add(question);
+		// question.setUnits(units); Needed for numerical type question
+		question.setQbQuestion(qbQuestion);
+		checkType(question.getType());
+		newQuestionSet.add(question);
 
-	    // all questions need to end up in user's private collection
-	    if (addToCollection) {
-		// qbService.addQuestionToCollection(collection.getUid(), qbQuestion.getQuestionId(), false);
-		collectionUUIDs.add(uuid);
+		// all questions need to end up in user's private collection
+		if (addToCollection) {
+		    qbService.addQuestionToCollection(collectionUid, qbQuestion.getQuestionId(), false);
+		    collectionUUIDs.add(uuid);
+		}
 	    }
 	}
 
 	// **************************** Now set up the references to the questions in the bank *********************
 	ArrayNode references = JsonUtil.optArray(toolContentJSON, "references");
-	Set<QuestionReference> newReferenceSet = assessment.getQuestionReferences(); // the Assessment constructor will set up the
+	if (references != null) {
+	    Set<QuestionReference> newReferenceSet = assessment.getQuestionReferences(); // the Assessment constructor will set up the
 
-	// collection
-	for (JsonNode referenceJSONData : references) {
-	    QuestionReference reference = new QuestionReference();
-	    reference.setMaxMark(JsonUtil.optInt(referenceJSONData, "maxMark", 1));
-	    reference.setSequenceId(JsonUtil.optInt(referenceJSONData, RestTags.DISPLAY_ORDER));
-	    AssessmentQuestion matchingQuestion = matchQuestion(newQuestionSet,
-		    JsonUtil.optInt(referenceJSONData, "questionDisplayOrder"));
-	    if (matchingQuestion == null) {
-		throw new IOException("Unable to find matching question for displayOrder "
-			+ referenceJSONData.get("questionDisplayOrder") + ". Data:" + toolContentJSON);
+	    // collection
+	    for (JsonNode referenceJSONData : references) {
+		QuestionReference reference = new QuestionReference();
+		reference.setMaxMark(JsonUtil.optInt(referenceJSONData, "maxMark", 1));
+		reference.setSequenceId(JsonUtil.optInt(referenceJSONData, RestTags.DISPLAY_ORDER));
+		AssessmentQuestion matchingQuestion = matchQuestion(newQuestionSet,
+			JsonUtil.optInt(referenceJSONData, "questionDisplayOrder"));
+		if (matchingQuestion == null) {
+		    throw new IOException("Unable to find matching question for displayOrder "
+			    + referenceJSONData.get("questionDisplayOrder") + ". Data:" + toolContentJSON);
+		}
+		reference.setQuestion(matchingQuestion);
+		reference.setRandomQuestion(JsonUtil.optBoolean(referenceJSONData, "randomQuestion", Boolean.FALSE));
+		newReferenceSet.add(reference);
 	    }
-	    reference.setQuestion(matchingQuestion);
-	    reference.setRandomQuestion(JsonUtil.optBoolean(referenceJSONData, "randomQuestion", Boolean.FALSE));
-	    newReferenceSet.add(reference);
 	}
 
 	saveOrUpdateAssessment(assessment);
@@ -4092,4 +4363,23 @@
 	Lesson lesson = lessonService.getLessonByToolContentId(toolContentId);
 	return lessonService.getLessonLearners(lesson.getLessonId(), searchString, null, null, true);
     }
+
+    @Override
+    public Map<Integer, Integer> getCountAnsweredQuestionsByUsers(long toolContentId) {
+	Map<Integer, Integer> answeredQuestions = assessmentResultDao.countAnsweredQuestionsByUsers(toolContentId);
+	if (answeredQuestions.isEmpty()) {
+	    return answeredQuestions;
+	}
+
+	Assessment assessment = getAssessmentByContentId(toolContentId);
+	int questionCount = assessment.getQuestions().size();
+
+	// list all question counts, from 0 to maximum possible questions
+	Map<Integer, Integer> result = new HashMap<>();
+	for (int i = 0; i <= questionCount; i++) {
+	    result.put(i, 0);
+	}
+	result.putAll(answeredQuestions);
+	return result;
+    }
 }
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -29,7 +29,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
 import org.lamsfoundation.lams.learningdesign.Grouping;
@@ -118,6 +117,10 @@
 
     int getCountUsersByContentId(Long contentId);
 
+    int getCountLessonLearnersByContentId(long contentId);
+
+    int getCountLearnersWithFinishedCurrentAttempt(long contentId);
+
     List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page, int size,
 	    String sortBy, String sortOrder, String searchString);
 
@@ -432,10 +435,14 @@
      * @return if present, it contains optionUid of the option group containing duplicate (added there presumably by
      *         another teacher working in parallel)
      */
-    Optional<Long> allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid,
-	    Long questionResultUid);
+    Long allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid, String answer);
 
     /**
+     * Recalculate learners' marks after a VSA answer was allocated as correct or incorrect.
+     */
+    void recalculateMarksForAllocatedAnswer(Long questionUid, String answer);
+
+    /**
      * For export purposes
      *
      * @param contentId
@@ -550,4 +557,6 @@
     Grouping getGrouping(long toolContentId);
 
     List<User> getPossibleIndividualTimeLimitUsers(long toolContentId, String searchString);
+
+    Map<Integer, Integer> getCountAnsweredQuestionsByUsers(long toolContentId);
 }
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -37,7 +37,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.TreeMap;
@@ -56,6 +55,8 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.learningdesign.Group;
 import org.lamsfoundation.lams.learningdesign.Grouping;
+import org.lamsfoundation.lams.logevent.LearnerInteractionEvent;
+import org.lamsfoundation.lams.logevent.service.ILearnerInteractionService;
 import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.lamsfoundation.lams.qb.service.IQbService;
@@ -109,6 +110,7 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.util.HtmlUtils;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -134,6 +136,9 @@
     @Autowired
     private IRatingService ratingService;
 
+    @Autowired
+    private ILearnerInteractionService learnerInteractionService;
+
     @RequestMapping("/summary")
     public String summary(HttpServletRequest request, HttpServletResponse response) {
 
@@ -168,7 +173,7 @@
 	}
 
 	//prepare list of the questions to display in question drop down menu, filtering out questions that aren't supposed to be answered
-	Set<AssessmentQuestion> questionList = new TreeSet<>();
+	List<AssessmentQuestion> questionList = new LinkedList<>();
 	//in case there is at least one random question - we need to show all questions in a drop down select
 	if (assessment.hasRandomQuestion()) {
 	    questionList.addAll(assessment.getQuestions());
@@ -250,6 +255,26 @@
 	return "pages/monitoring/monitoring";
     }
 
+    @RequestMapping(path = "/getCompletionChartsData")
+    @ResponseBody
+    public String getCompletionChartsData(@RequestParam long toolContentId, HttpServletResponse response)
+	    throws JsonProcessingException, IOException {
+	ObjectNode chartJson = JsonNodeFactory.instance.objectNode();
+
+	chartJson.put("possibleLearners", service.getCountLessonLearnersByContentId(toolContentId));
+	chartJson.put("startedLearners", service.getCountUsersByContentId(toolContentId));
+	chartJson.put("completedLearners", service.getCountLearnersWithFinishedCurrentAttempt(toolContentId));
+
+	chartJson.put("sessionCount", service.getSessionsByContentId(toolContentId).size());
+	Map<Integer, Integer> answeredQuestionsByUsers = service.getCountAnsweredQuestionsByUsers(toolContentId);
+	if (!answeredQuestionsByUsers.isEmpty()) {
+	    chartJson.set("answeredQuestionsByUsers", JsonUtil.readObject(answeredQuestionsByUsers));
+	}
+
+	response.setContentType("application/json;charset=utf-8");
+	return chartJson.toString();
+    }
+
     @RequestMapping("/userMasterDetail")
     public String userMasterDetail(HttpServletRequest request, HttpServletResponse response) {
 	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
@@ -283,12 +308,39 @@
     public String allocateUserAnswer(HttpServletRequest request, HttpServletResponse response,
 	    @RequestParam Long questionUid, @RequestParam Long targetOptionUid, @RequestParam Long previousOptionUid,
 	    @RequestParam Long questionResultUid) {
-	Optional<Long> optionUid = service.allocateAnswerToOption(questionUid, targetOptionUid, previousOptionUid,
-		questionResultUid);
 
+	Long optionUid = null;
+
+	if (!targetOptionUid.equals(previousOptionUid)) {
+	    AssessmentQuestionResult questionRes = service.getAssessmentQuestionResultByUid(questionResultUid);
+	    String answer = questionRes.getAnswer();
+	    /*
+	     * We need to synchronise this operation.
+	     * When multiple requests are made to modify the same option, for example to add a VSA answer,
+	     * we have a case of dirty reads.
+	     * One answer gets added, but while DB is still flushing,
+	     * another answer reads the option without the first answer,
+	     * because it is not there yet.
+	     * The second answer gets added, but the first one gets lost.
+	     *
+	     * We can not synchronise the method in service
+	     * as the "dirty" transaction is already started before synchronisation kicks in.
+	     * We do it here, before transaction starts.
+	     * It will not work for distributed environment, though.
+	     * If teachers allocate answers on different LAMS servers,
+	     * we can still get the same problem. We will need a more sophisticated solution then.
+	     */
+
+	    synchronized (service) {
+		optionUid = service.allocateAnswerToOption(questionUid, targetOptionUid, previousOptionUid, answer);
+	    }
+	    //recalculate marks for all lessons in all cases except for reshuffling inside the same container
+	    service.recalculateMarksForAllocatedAnswer(questionUid, answer);
+	}
+
 	ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
-	responseJSON.put("isAnswerDuplicated", optionUid.isPresent());
-	responseJSON.put("optionUid", optionUid.orElse(-1L));
+	responseJSON.put("isAnswerDuplicated", optionUid != null);
+	responseJSON.put("optionUid", optionUid == null ? -1 : optionUid);
 	response.setContentType("application/json;charset=utf-8");
 	return responseJSON.toString();
     }
@@ -304,6 +356,10 @@
 	UserSummary userSummary = service.getUserSummary(contentId, userId, sessionId);
 	request.setAttribute(AssessmentConstants.ATTR_USER_SUMMARY, userSummary);
 
+	Map<Long, LearnerInteractionEvent> learnerInteractions = learnerInteractionService
+		.getFirstLearnerInteractions(contentId, userId.intValue());
+	request.setAttribute("learnerInteractions", learnerInteractions);
+
 	Assessment assessment = service.getAssessmentByContentId(contentId);
 	boolean questionEtherpadEnabled = assessment.isUseSelectLeaderToolOuput()
 		&& assessment.isQuestionEtherpadEnabled()
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -12,7 +12,23 @@
 			qbMessage = '<fmt:message key="message.qb.modified.update" />';
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_VERSION_BUMP %>: 
-			qbMessage = '<fmt:message key="message.qb.modified.version" />';
+			let showMessage = true;
+		
+			// check if we are in main authoring environment
+			if (typeof window.parent.GeneralLib != 'undefined') {
+				// check if any other activities require updating
+				let activitiesWithQuestion = window.parent.GeneralLib.checkQuestionExistsInToolActivities('${oldQbQuestionUid}');
+				if (activitiesWithQuestion.length > 1) {
+					showMessage = false;
+					// update, if teacher agrees to it
+					window.parent.GeneralLib.replaceQuestionInToolActivities('${sessionMap.toolContentID}', activitiesWithQuestion, 
+																			 '${oldQbQuestionUid}','${newQbQuestionUid}');
+				}
+			}
+	
+			if (showMessage) {
+				qbMessage = '<fmt:message key="message.qb.modified.version" />';
+			}
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_ID_BUMP %>: 
 			qbMessage = '<fmt:message key="message.qb.modified.new" />';
@@ -65,6 +81,9 @@
 			}
 		});
 		</c:if>
+		
+		
+	    $('[data-toggle="tooltip"]').bootstrapTooltip();
 	});
 </script>
 
@@ -75,7 +94,7 @@
 				<th>
 					#
 				</th>
-				<th>
+				<th colspan="5">
 					<fmt:message key="label.authoring.basic.list.header.question" />
 				</th>
 				<th colspan="4">
@@ -101,60 +120,110 @@
 							<c:out value="${question.qbQuestion.name}" escapeXml="true"/>
 						</c:otherwise>
 					</c:choose>
-					
-					<c:if test="${!questionReference.randomQuestion}">
-				        <span class='pull-right alert-info btn-xs loffset5 roffset5'>
-				       		v.&nbsp;${question.qbQuestion.version}
-				        </span>
-			        </c:if>
-			        
-			       	<span class='pull-right alert-info btn-xs'>
-						<c:choose>
-							<c:when test="${questionReference.randomQuestion}">
-								<fmt:message key="label.authoring.basic.type.random.question" />
+				</td>
+				<td style="width:30px; vertical-align: top">
+					<span class='alert-info btn-xs question-type-alert'>
+							<c:choose>
+								<c:when test="${questionReference.randomQuestion}">
+									<fmt:message key="label.authoring.basic.type.random.question" />
+								</c:when>
+								<c:when test="${question.type == 1}">
+									<fmt:message key="label.authoring.basic.type.multiple.choice" />
+								</c:when>
+								<c:when test="${question.type == 2}">
+									<fmt:message key="label.authoring.basic.type.matching.pairs" />
+								</c:when>
+								<c:when test="${question.type == 3}">
+									<fmt:message key="label.authoring.basic.type.short.answer" />
+								</c:when>
+								<c:when test="${question.type == 4}">
+									<fmt:message key="label.authoring.basic.type.numerical" />
+								</c:when>
+								<c:when test="${question.type == 5}">
+									<fmt:message key="label.authoring.basic.type.true.false" />
+								</c:when>
+								<c:when test="${question.type == 6}">
+									<fmt:message key="label.authoring.basic.type.essay" />
+								</c:when>
+								<c:when test="${question.type == 7}">
+									<fmt:message key="label.authoring.basic.type.ordering" />
+								</c:when>
+								<c:when test="${question.type == 8}">
+									<fmt:message key="label.authoring.basic.type.mark.hedging" />
+								</c:when>
+							</c:choose>
+		       			</span>
+				</td>	
+				<td width="30px">
+			        <c:if test="${!questionReference.randomQuestion}">
+				        <c:set var="maxOtherVersion" />
+					    <c:choose>
+							<c:when test="${fn:length(question.qbQuestion.versionMap) == 1}">
+								<button class="btn btn-default btn-xs dropdown-toggle2 question-version-dropdown" disabled="disabled">
+								   <fmt:message key="label.authoring.basic.question.version" /> ${question.qbQuestion.version}
+								</button>
 							</c:when>
-							<c:when test="${question.type == 1}">
-								<fmt:message key="label.authoring.basic.type.multiple.choice" />
-							</c:when>
-							<c:when test="${question.type == 2}">
-								<fmt:message key="label.authoring.basic.type.matching.pairs" />
-							</c:when>
-							<c:when test="${question.type == 3}">
-								<fmt:message key="label.authoring.basic.type.short.answer" />
-							</c:when>
-							<c:when test="${question.type == 4}">
-								<fmt:message key="label.authoring.basic.type.numerical" />
-							</c:when>
-							<c:when test="${question.type == 5}">
-								<fmt:message key="label.authoring.basic.type.true.false" />
-							</c:when>
-							<c:when test="${question.type == 6}">
-								<fmt:message key="label.authoring.basic.type.essay" />
-							</c:when>
-							<c:when test="${question.type == 7}">
-								<fmt:message key="label.authoring.basic.type.ordering" />
-							</c:when>
-							<c:when test="${question.type == 8}">
-								<fmt:message key="label.authoring.basic.type.mark.hedging" />
-							</c:when>
+				
+							<c:otherwise>
+								<div class="dropdown question-version-dropdown">
+									<button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+								    	<fmt:message key="label.authoring.basic.question.version" />&nbsp;${question.qbQuestion.version}&nbsp;<span class="caret"></span>
+									</button>
+									
+									<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+										<c:forEach items="${question.qbQuestion.versionMap}" var="otherVersion">
+											 <c:set var="maxOtherVersion" value="${otherVersion}" />
+											 
+								    		<li <c:if test="${question.qbQuestion.version == otherVersion.key}">class="disabled"</c:if>>
+								    			<a href="#nogo" 
+								    			   data-toggle="tooltip" data-placement="top" title="<fmt:message key="label.authoring.basic.question.version.change.tooltip" />"
+								    			   onclick="javascript:changeItemQuestionVersion(${status.index}, ${question.qbQuestion.uid}, ${otherVersion.value})">
+								    				  <fmt:message key="label.authoring.basic.question.version" />&nbsp;${otherVersion.key}
+								    			</a>
+								    			<a href="#nogo" class="pull-right"
+								    			   data-toggle="tooltip" data-placement="top" title="<fmt:message key="label.authoring.basic.question.version.stats.tooltip" />"
+								    			   onClick='javascript:window.open("<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=${otherVersion.value}", "_blank")'>
+									    			  <i class='fa fa-bar-chart'></i>
+												</a>
+								    		</li>
+								    	</c:forEach>
+									</ul>
+		
+								</div>			
+							</c:otherwise>
 						</c:choose>
-	       			</span>
+					</c:if>
 				</td>
 				
+				<td width="30px">
+					<c:if test="${not empty maxOtherVersion and question.qbQuestion.version < maxOtherVersion.key}">
+						<i class="fa fa-exclamation-triangle newer-version-prompt" data-toggle="tooltip" data-placement="top"
+						   data-toggle="tooltip" data-placement="top" title="<fmt:message key="label.authoring.basic.question.version.newer.tooltip" />" 
+						   onClick='javascript:window.open("<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=${maxOtherVersion.value}", "_blank")'>
+					</i>
+					</c:if>
+				</td>
+				
+				<td align="center"  width="30px">
+		    		<i class='fa fa-bar-chart' data-toggle="tooltip" data-placement="top" title="<fmt:message key="label.authoring.basic.question.version.stats.tooltip" />"
+	    			   onClick='javascript:window.open("<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=${question.qbQuestion.version}", "_blank")'>
+	    			</i>
+				</td>	
+				
 				<td width="70px" style="padding-right: 10px;">
 					<input name="maxMark" value="${questionReference.maxMark}" class="form-control input-sm max-mark-input">
 				</td>
 				
 				<td width="30px">
 					<i class="fa fa-xs fa-asterisk ${question.answerRequired ? 'text-danger' : ''}" 
-								title="<fmt:message key="label.answer.required"/>" 
+								data-toggle="tooltip" data-placement="top" title="<fmt:message key="label.answer.required"/>" 
 								alt="<fmt:message key="label.answer.required"/>"
 								onClick="javascript:toggleQuestionRequired(this)"></i>
 				</td>
 				
 				<td width="30px">
 					<a class="thickbox roffset5x edit-reference-link" onclick="javascript:editReference(this);" style="color: black;"> 
-						<i class="fa fa-pencil"	title="<fmt:message key="label.authoring.basic.edit" />"></i>
+						<i class="fa fa-pencil"	 title="<fmt:message key="label.authoring.basic.edit" />"></i>
 					</a>
 				</td>
 
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -5,6 +5,11 @@
 <c:set var="assessment" value="${sessionMap.assessment}"/>
 
 <script type="text/javascript">
+	var activityCompletionChart = null,
+		answeredQuestionsChart = null;
+	// how often completion charts will be updated
+	const COMPLETION_CHART_UPDATE_INTERVAL = 10 * 1000;
+
 	$(document).ready(function(){
 		
 		initializePortraitPopover("<lams:LAMSURL />");
@@ -212,6 +217,10 @@
 
 		// ajax calls to disclose correct/groups answers
 	    correctButton.click(function(){
+	    	if (!confirm("<fmt:message key='message.disclose.correct.answers' />")) {
+	    		return;
+	    	};
+	    	
 			$.ajax({
                 type: 'POST',
 				'url'  : '<lams:WebAppURL />monitoring/discloseCorrectAnswers.do?<csrf:token/>',
@@ -226,6 +235,10 @@
 		});
 
 	    groupsButton.click(function(){
+	    	if (!confirm("<fmt:message key='message.disclose.groups.answers' />")) {
+	    		return;
+	    	};
+	    	
 			$.ajax({
                 type: 'POST',
 				'url'  : '<lams:WebAppURL />monitoring/discloseGroupsAnswers.do?<csrf:token/>',
@@ -240,6 +253,10 @@
 		});
 
 	    correctAllButton.click(function(){
+	    	if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
+	    		return;
+	    	};
+	    	
 		    $('option[correctDisclosed="false"]', questionUidSelect).each(function(){
 			    var option = $(this),
 			    	questionUid = option.val();
@@ -261,6 +278,10 @@
 		});
 
 	    groupsAllButton.click(function(){
+	    	if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
+	    		return;
+	    	};
+	    	
 		    $('option[groupsDisclosed="false"]', questionUidSelect).each(function(){
 			    var option = $(this),
 			    	questionUid = option.val();
@@ -294,6 +315,8 @@
 			}
 		}
 		initInidividualTimeLimitAutocomplete();
+		
+		drawCompletionCharts(${assessment.contentId}, ${assessment.useSelectLeaderToolOuput}, true);
 	});
 
 	function resizeJqgrid(jqgrids) {
@@ -653,15 +676,28 @@
 	  <c:out value="${assessment.instructions}" escapeXml="false"/>
 	</div>
 	
-	<c:if test="${empty sessionDtos}">
-		<lams:Alert type="info" id="no-session-summary" close="false">
-			<fmt:message key="message.monitoring.summary.no.session" />
-		</lams:Alert>
-	</c:if>
+	<c:choose>
+		<c:when test="${empty sessionDtos}">
+			<lams:Alert type="info" id="no-session-summary" close="false">
+				<fmt:message key="message.monitoring.summary.no.session" />
+			</lams:Alert>
+		</c:when>
+		<c:otherwise>
+			<div id="completion-charts-container">
+				<div class="col-sm-12 col-md-6">
+					<canvas id="activity-completion-chart"></canvas>
+				</div>
+				
+				<div class="col-sm-12 col-md-6">
+					<canvas id="answered-questions-chart"></canvas>
+				</div>
+			</div>
+		</c:otherwise>
+	</c:choose>
 
+
 	<lams:WaitingSpinner id="messageArea_Busy"></lams:WaitingSpinner>
 	<div class="voffset5 help-block" id="messageArea"></div>
-			
 </div>
 
 <c:if test="${not empty sessionDtos}">
@@ -761,9 +797,11 @@
 			<a id="questionDiscloseCorrect" class="btn btn-default disabled">
 				<fmt:message key="label.disclose.correct.answers" />
 			</a>
-			<a id="questionDiscloseGroups" class="btn btn-default disabled">
-				<fmt:message key="label.disclose.groups.answers" />
-			</a>
+			<c:if test="${sessionMap.isGroupedActivity}">
+				<a id="questionDiscloseGroups" class="btn btn-default disabled">
+					<fmt:message key="label.disclose.groups.answers" />
+				</a>
+			</c:if>
 		</c:if>
 	</div>
 
@@ -775,12 +813,14 @@
 					</c:if>
 					<fmt:message key="label.disclose.all.correct.answers" />
 				</a>
-				<a id="discloseAllGroups" class="btn btn-default ${allGroupsDisclosed ? 'disabled' : ''}">
-					<c:if test="${allGroupsDisclosed}">
-						<i class="fa fa-check text-success">&nbsp;</i>
-					</c:if>
-					<fmt:message key="label.disclose.all.groups.answers" />
-				</a>
+				<c:if test="${sessionMap.isGroupedActivity}">
+					<a id="discloseAllGroups" class="btn btn-default ${allGroupsDisclosed ? 'disabled' : ''}">
+						<c:if test="${allGroupsDisclosed}">
+							<i class="fa fa-check text-success">&nbsp;</i>
+						</c:if>
+						<fmt:message key="label.disclose.all.groups.answers" />
+					</a>
+				</c:if>
 			</div>
 		</c:if>
 </c:if>
Index: lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql
===================================================================
diff -u -r2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql	(.../create_lams_tool_scratchie.sql)	(revision 2b7ffc7c6e661a7f78d74a80a367b87d1f71e2fe)
+++ lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql	(.../create_lams_tool_scratchie.sql)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -14,6 +14,7 @@
    extra_point TINYINT(1),
    submission_deadline datetime,
    burning_questions_enabled TINYINT(1) DEFAULT 1,
+   question_etherpad_enabled TINYINT(1) DEFAULT 0,
    time_limit int(11) DEFAULT 0,
    shuffle_items TINYINT(1) DEFAULT 0,
    confidence_levels_activity_uiid INT(11),
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -65,6 +65,8 @@
 import org.lamsfoundation.lams.tool.scratchie.web.form.ScratchiePedagogicalPlannerForm;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.CommonConstants;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -185,6 +187,9 @@
 		scratchieItem.setDisplayOrder(i);
 	    }
 	    i++;
+
+	    // prepare other version data for displaying
+	    qbService.fillVersionMap(scratchieItem.getQbQuestion());
 	}
 
 	//display confidence providing activities
@@ -206,6 +211,10 @@
 	}
 	sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	sessionMap.put(ScratchieConstants.ATTR_RESOURCE_FORM, authoringForm);
+
+	boolean questionEtherpadEnabled = StringUtils.isNotBlank(Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY));
+	sessionMap.put(ScratchieConstants.ATTR_IS_QUESTION_ETHERPAD_ENABLED, questionEtherpadEnabled);
+
 	return "pages/authoring/start";
     }
 
@@ -430,6 +439,9 @@
 	itemList.add(item);
 	ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
 
+	// prepare other version data for displaying
+	qbService.fillVersionMap(item.getQbQuestion());
+
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return "pages/authoring/parts/itemlist";
@@ -454,7 +466,8 @@
      * persisted.
      */
     @RequestMapping(value = "/saveItem", method = RequestMethod.POST)
-    private String saveItem(@ModelAttribute("scratchieItemForm") QbQuestionForm form, HttpServletRequest request) {
+    private String saveItem(@ModelAttribute("scratchieItemForm") QbQuestionForm form, HttpServletRequest request,
+	    @RequestParam(name = "newVersion", required = false) boolean enforceNewVersion) {
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(form.getSessionMapID());
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
@@ -522,6 +535,9 @@
 
 	int isQbQuestionModified = isDefaultQuestion ? IQbService.QUESTION_MODIFIED_ID_BUMP
 		: qbQuestion.isQbQuestionModified(oldQbQuestion);
+	if (isQbQuestionModified < IQbService.QUESTION_MODIFIED_VERSION_BUMP && enforceNewVersion) {
+	    isQbQuestionModified = IQbService.QUESTION_MODIFIED_VERSION_BUMP;
+	}
 	QbQuestion updatedQuestion = null;
 	switch (isQbQuestionModified) {
 	    case IQbService.QUESTION_MODIFIED_VERSION_BUMP: {
@@ -549,7 +565,12 @@
 	}
 	userManagementService.save(updatedQuestion);
 	item.setQbQuestion(updatedQuestion);
+
 	request.setAttribute("qbQuestionModified", isQbQuestionModified);
+	if (isQbQuestionModified == IQbService.QUESTION_MODIFIED_VERSION_BUMP) {
+	    request.setAttribute("oldQbQuestionUid", qbQuestion.getUid());
+	    request.setAttribute("newQbQuestionUid", updatedQuestion.getUid());
+	}
 
 	//take care about question's collections. add to collection first
 	Long oldCollectionUid = form.getOldCollectionUid();
@@ -564,6 +585,9 @@
 		    false);
 	}
 
+	// prepare other version data for displaying
+	qbService.fillVersionMap(item.getQbQuestion());
+
 	// set session map ID so that itemlist.jsp can get sessionMAP
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, form.getSessionMapID());
 	return "pages/authoring/parts/itemlist";
@@ -623,6 +647,21 @@
 	itemList.addAll(updatedItemList);
     }
 
+    @RequestMapping("/changeItemQuestionVersion")
+    private String changeItemQuestionVersion(@RequestParam int itemIndex, @RequestParam long newQbQuestionUid,
+	    HttpServletRequest request) {
+	SessionMap<String, Object> sessionMap = getSessionMap(request);
+	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
+	List<ScratchieItem> rList = new ArrayList<>(itemList);
+	ScratchieItem item = rList.get(itemIndex);
+	QbQuestion newQbQuestion = qbService.getQuestionByUid(newQbQuestionUid);
+	qbService.fillVersionMap(newQbQuestion);
+	item.setQbQuestion(newQbQuestion);
+
+	request.setAttribute(ScratchieConstants.ATTR_ITEM_LIST, itemList);
+	return "pages/authoring/parts/itemlist";
+    }
+
     // ----------------------- Options functions ---------------
 
     /**
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -43,6 +43,37 @@
 		};
 	}
 
+	
+	function changeItemQuestionVersion(itemIndex, oldQbQuestionUid, newQbQuestionUid) {
+		if (oldQbQuestionUid == newQbQuestionUid) {
+			return;
+		}
+		
+		var url = "<c:url value="/authoring/changeItemQuestionVersion.do"/>";
+		$(itemTargetDiv).load(
+			url,
+			{
+				itemIndex: itemIndex,
+				sessionMapID: "${sessionMapID}",
+				newQbQuestionUid : newQbQuestionUid
+			},
+			function(){
+				refreshThickbox();
+				
+				// check if we are in main authoring environment
+				if (typeof window.parent.GeneralLib != 'undefined') {
+					// check if any other activities require updating
+					let activitiesWithQuestion = window.parent.GeneralLib.checkQuestionExistsInToolActivities(oldQbQuestionUid);
+					if (activitiesWithQuestion.length > 1) {
+						// update, if teacher agrees to it
+						window.parent.GeneralLib.replaceQuestionInToolActivities('${sessionMap.toolContentID}', activitiesWithQuestion,
+																				 oldQbQuestionUid, newQbQuestionUid);
+					}
+				}
+			}
+		);
+	}
+	
 	function initNewItemHref() {
 		var itemTypeDropdown = document.getElementById("item-type");
 		var itemType = itemTypeDropdown.value;
@@ -57,8 +88,8 @@
 		tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
 	}
 	
-    function importQTI(){
-    	window.open('<lams:LAMSURL/>questions/questionFile.jsp?limitType=mc&collectionChoice=true',
+    function importQTI(type){
+    	window.open('<lams:LAMSURL/>questions/questionFile.jsp?limitType=mc&collectionChoice=true&importType='+type,
     			    'QuestionFile','width=500,height=370,scrollbars=yes');
     }
   	
@@ -119,7 +150,19 @@
 		<a onclick="initNewItemHref();return false;" href="#nogo" class="btn btn-default btn-sm thickbox" id="item-init-href">  
 			<i class="fa fa-lg fa-plus-circle" aria-hidden="true" title="<fmt:message key="label.authoring.basic.add.another.scratchie" />"></i>
 		</a>
+        
+       <div class="dropdown pull-right" style="padding-left: 1em;">
+          <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <i class="fa fa-plus text-primary"></i> <fmt:message key="label.authoring.import"/>&nbsp;
+            <span class="caret"></span>
+          </button>
+          <ul class="dropdown-menu dropdown-menu-right">
+              <li><a href="javascript:void(0)" id="divass${appexNumber}CQTI" onClick="javascript:importQTI('word')"><i class="fa fa-file-word-o text-primary"></i> <fmt:message key="label.authoring.basic.import.word"/>...</a></li>
+            <li><a href="javascript:void(0)" id="divass${appexNumber}CWord" onClick="javascript:importQTI('qti')"><i class="fa fa-file-code-o text-primary"></i> <fmt:message key="label.authoring.basic.import.qti"/>...</a></li>
+           </ul>
+        </div>
 	</div>
+
 	
 	<!-- Question Bank -->
 	<div class="panel-group" id="question-bank-div" role="tablist" aria-multiselectable="true"> 
Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
===================================================================
diff -u -rcf258bae4dd72eab7a6f5bc895b96966caafaf06 -rc53377c8f651bf0c9eedc5f2d4f26f5e1647caf3
--- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision cf258bae4dd72eab7a6f5bc895b96966caafaf06)
+++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(.../itemlist.jsp)	(revision c53377c8f651bf0c9eedc5f2d4f26f5e1647caf3)
@@ -12,9 +12,25 @@
 	switch (qbQuestionModified) {
 		case <%= IQbService.QUESTION_MODIFIED_UPDATE %>: 
 			qbMessage = '<fmt:message key="message.qb.modified.update" />';
-			break;
 		case <%= IQbService.QUESTION_MODIFIED_VERSION_BUMP %>: 
-			qbMessage = '<fmt:message key="message.qb.modified.version" />';
+			let showMessage = true;
+		
+			// check if we are in main authoring environment
+			if (typeof window.parent.GeneralLib != 'undefined') {
+				// check if any other activities require updating
+				let activitiesWithQuestion = window.parent.GeneralLib.checkQuestionExistsInToolActivities('${oldQbQuestionUid}');
+				if (activitiesWithQuestion.length > 1) {
+					showMessage = false;
+					// update, if teacher agrees to it
+					window.parent.GeneralLib.replaceQuestionInToolActivities('${sessionMap.toolContentID}', activitiesWithQuestion, 
+																			 '${oldQbQuestionUid}','${newQbQuestionUid}');
+				}
+			}
+
+			if (showMessage) {
+				qbMessage = '<fmt:message key="message.qb.modified.version" />';
+			}
+
 			break;
 		case <%= IQbService.QUESTION_MODIFIED_ID_BUMP %>: 
 			qbMessage = '<fmt:message key="message.qb.modified.new" />';
@@ -25,6 +41,7 @@
 	}
 	
 $(document).ready(function(){
+		$('[data-toggle="tooltip"]').bootstrapTooltip();
 		
 	    //init questions sorting
 	    <c:if test="${not empty sessionMap.itemList}">
@@ -73,11 +90,6 @@
 <!-- Dropdown menu for choosing a question from question bank -->
 <div class="panel panel-default voffset20">
 	<div class="panel-heading panel-title">
-		<div id="importExport" class="btn-group pull-right">
-			<a href="#" id="importQTILink" onClick="javascript:importQTI();return false;" class="btn btn-default btn-xs loffset5">
-				<fmt:message key="label.authoring.import.qti" /> 
-			</a>
-		</div> 
 		<fmt:message key="label.questions"/>
 	</div>
 	<input type="hidden" name="itemCount" id="itemCount" value="${fn:length(sessionMap.itemList)}">
@@ -92,12 +104,10 @@
 					<input type="hidden" name="sequenceId${item.displayOrder}" value="${status.index}" class="item-sequence-id">
 					
 					<c:out value="${item.qbQuestion.name}" escapeXml="true"/>
-					
-				    <span class='pull-right alert-info btn-xs loffset5 roffset5'>
-				    	v.&nbsp;${item.qbQuestion.version}
-				    </span>
-				    
-				   	<span class='pull-right alert-info btn-xs'>
+				</td>
+				
+				<td style="width:1%; vertical-align: top">
+					<span class='alert-info btn-xs question-type-alert'>
 						<c:choose>
 							<c:when test="${item.qbQuestion.type == 1}">
 								<fmt:message key="label.type.multiple.choice" />
@@ -108,8 +118,73 @@
 						</c:choose>
 	       			</span>
 				</td>
-					
-				<td align="center" style="width:5%">
+				<td style="width:3%">
+				    <c:set var="maxOtherVersion" />
+				    <c:choose>
+						<c:when test="${fn:length(item.qbQuestion.versionMap) == 1}">
+							<button class="btn btn-default btn-xs dropdown-toggle2 question-version-dropdown" disabled="disabled">
+							   <fmt:message key="label.authoring.question.version" /> ${item.qbQuestion.version}
+							</button>
+						</c:when>
+			
+						<c:otherwise>
+							<div class="dropdown question-version-dropdown">
+								<button class="btn btn-default btn-xs dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							    	<fmt:message key="label.authoring.question.version" />&nbsp;${item.qbQuestion.version}&nbsp;<span class="caret"></span>
+								</button>
+								
+								<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+									<c:forEach items="${item.qbQuestion.versionMap}" var="otherVersion">
+										 <c:set var="maxOtherVersion" value="${otherVersion}" />
+										 
+							    		<li <c:if test="${item.qbQuestion.version == otherVersion.key}">class="disabled"</c:if>>
+							    			<a href="#nogo" data-toggle="tooltip" data-placement="top"
+							    			   title="<fmt:message key="label.authoring.question.version.change.tooltip" />"
+							    			   onclick="javascript:changeItemQuestionVersion(${status.index}, ${item.qbQuestion.uid}, ${otherVersion.value})">
+							    				  <fmt:message key="label.authoring.question.version" />&nbsp;${otherVersion.key}
+							    			</a>
+							    			<a href="#nogo" class="pull-right" data-toggle="tooltip" data-placement="top"
+							    			   title="<fmt:message key="label.authoring.question.version.stats.tooltip" />"
+							    			   onClick='javascript:window.open("<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=${otherVersion.value}", "_blank")'>
+								    			  <i class='fa fa-bar-chart'></i>
+											</a>
+							    		</li>
+							    	</c:forEach>
+								</ul>
+	
+							</div>			
+						</c:otherwise>
+					</c:choose>
+				</td>
+				
+				<td style="width: 3%">
+					<c:if test="${not empty maxOtherVersion and item.qbQuestion.version < maxOtherVersion.key}">
+						<i class="fa fa-exclamation-triangle newer-version-prompt" data-toggle="tooltip" data-placement="top"
+						   title="<fmt:message key="label.authoring.question.version.newer.tooltip" />" 
+						   onClick='javascript:window.open("<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=${maxOtherVersion.value}", "_blank")'>
+					</i>
+					</c:if>
+				</td>
+				
+				<td align="center" style="width:3%">
+		    		<i class='fa fa-bar-chart' data-toggle="tooltip" data-placement="top" title="<fmt:message key="label.authoring.question.version.stats.tooltip" />"
+	    			   onClick='javascript:window.open("<lams:LAMSURL/>qb/stats/show.do?qbQuestionUid=${item.qbQuestion.version}", "_blank")'>
+	    			</i>
+				</td>	
+				
+				<c:if test="${!isAuthoringRestricted}">
+					<td class="arrows" style="width:3%">
+						<c:if test="${not status.first}">
+							<lams:Arrow state="up" titleKey="label.up" onclick="return upItem(${status.index})"/>
+						</c:if>
+			
+						<c:if test="${not status.last}">
+							<lams:Arrow state="down" titleKey="label.down" onclick="return downItem(${status.index})"/>
+						</c:if>
+					</td>
+				</c:if>
+				
+				<td align="center" style="width:3%">
 					<c:set var="editItemUrl" >
 						<c:url value='/authoring/editItem.do'/>?sessionMapID=${sessionMapID}&itemIndex=${status.index}&KeepThis=true&TB_iframe=true&modal=true
 					</c:set>		
@@ -119,7 +194,7 @@
 				</td>			
 				
 				<c:if test="${!isAuthoringRestricted}">
-					<td align="center" style="width:5%">
+					<td align="center" style="width:3%">
 						<i class="fa fa-times"	title="<fmt:message key="label.delete" />" id="delete${status.index}" 
 							onclick="removeItem(${status.index})"></i>
 					</td>