Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb812eb010aa5c6d01ef10b19d6325900b7ae5963 -r6cd828445d4549e4d114c5333628d812233f0f7a
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b812eb010aa5c6d01ef10b19d6325900b7ae5963)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6cd828445d4549e4d114c5333628d812233f0f7a)
@@ -80,6 +80,7 @@
 label.authoring.advance.questions.per.page = Questions per page
 label.authoring.advance.all.in.one.page = All in one page
 label.authoring.advance.shuffle.questions = Shuffle questions
+label.authoring.advance.shuffle.answers = Shuffle answers
 label.authoring.advance.attempts.allowed = Attempts allowed
 label.authoring.advance.unlimited = Unlimited
 label.authoring.advance.allow.students.question.feedback = Allow learners to see question feedback after each question
@@ -115,6 +116,7 @@
 label.learning.penalty = This submission attracted a penalty of {0}.
 label.learning.finish.test = Finish
 label.learning.submit.all = Complete activity
+label.learning.submit.all.confirm = Are you sure you want to submit your answers? You will not be able to change them after you submit.
 label.learning.resubmit = Resubmit
 label.learning.summary.started.on = Started on
 label.learning.summary.completed.on = Completed on
@@ -202,7 +204,7 @@
 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.
-monitor.summary.date.restriction = Deadline
+monitor.summary.date.restriction = Assessment availability
 monitor.summary.when.date.restriction.is.set = Learners will not be able to take this assessment after the set date and time.
 monitor.summary.after.date = Date/time:
 monitor.summary.set.restriction = Set restriction
@@ -254,7 +256,7 @@
 label.authoring.basic.export.qti = Export IMS QTI
 label.monitoring.heading = Assessment Monitoring
 label.maximum.number.words = Maximum number of words
-label.minimum.number.words = Minimum number of words in a comment {0}
+label.minimum.number.words = Minimum number of words
 label.info.maximum.number.words = This answer must have a maximum of {0} words.
 label.info.minimum.number.words = This answer must have a minimum of {0} words.
 label.info.max.and.min.number.words = This answer must have a minimal of {0} and maximum of {1} words.
@@ -458,7 +460,7 @@
 label.monitoring.user.summary.marker.comment = Comment
 label.monitoring.user.summary.marker = Marker
 label.activity.monitoring = Activity details
-# Accessibility labels. Might not be shown in the screen but it is to be read by screen readers. 
+# Accessibility labels. Might not be shown in the screen but it is to be read by screen readers.
 label.stars.rate = Select stars to rate
 # Accessibility labels. Might not be shown in the screen but it is to be read by screen readers.
 button.post.comment = Post comment
@@ -481,4 +483,4 @@
 label.support.activity = Support activity
 label.completed.activity = Activity completed
 label.current.activity = Current activity
-label.not.started.activity = Activity not reached yet
+label.not.started.activity = Activity not reached yet
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r067e828d94163bebff1b41b13e9503f1e6039dc4 -r6cd828445d4549e4d114c5333628d812233f0f7a
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 067e828d94163bebff1b41b13e9503f1e6039dc4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 6cd828445d4549e4d114c5333628d812233f0f7a)
@@ -23,33 +23,9 @@
 
 package org.lamsfoundation.lams.tool.assessment.web.controller;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TimeZone;
-import java.util.TreeSet;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.flux.FluxRegistry;
@@ -108,9 +84,31 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TimeZone;
+import java.util.TreeSet;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * @author Andrey Balan
@@ -375,7 +373,8 @@
 	    questionDtos = new LinkedList<>(shuffledList);
 	}
 	for (QuestionDTO questionDto : questionDtos) {
-	    if (questionDto.isShuffle() || (questionDto.getType() == QbQuestion.TYPE_ORDERING)) {
+	    if (assessment.isShuffledAnswers() || questionDto.isShuffle() || (questionDto.getType()
+		    == QbQuestion.TYPE_ORDERING)) {
 		ArrayList<OptionDTO> shuffledList = new ArrayList<>(questionDto.getOptionDtos());
 		Collections.shuffle(shuffledList);
 		questionDto.setOptionDtos(new LinkedHashSet<>(shuffledList));
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r358c00c5ad71e03c7b22e30b8bcd883375ff6e1e -r6cd828445d4549e4d114c5333628d812233f0f7a
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 358c00c5ad71e03c7b22e30b8bcd883375ff6e1e)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 6cd828445d4549e4d114c5333628d812233f0f7a)
@@ -67,7 +67,8 @@
         </c:choose>
     </c:forEach>
     <script type="text/javascript">
-        var skipValidation = false;
+        var skipValidation = false,
+            isResubmitAllowed = ${empty isResubmitAllowed ? false : isResubmitAllowed};
 
         $(document).ready(function(){
             //if isLeadershipEnabled - enable/disable submit buttons for hedging marks type of questions
@@ -112,32 +113,32 @@
             }
 
             initWebsocket('assessmentTimeLimit${sessionMap.assessment.contentId}',
-                    '<lams:WebAppURL />'.replace('http', 'ws')
-                    + 'learningWebsocket?toolContentID=${sessionMap.assessment.contentId}',
-                    function (e) {
-                        // read JSON object
-                        var input = JSON.parse(e.data);
+                '<lams:WebAppURL />'.replace('http', 'ws')
+                + 'learningWebsocket?toolContentID=${sessionMap.assessment.contentId}',
+                function (e) {
+                    // read JSON object
+                    var input = JSON.parse(e.data);
 
-                        if (input.clearTimer == true) {
-                            // teacher stopped the timer, destroy it
-                            $('#countdown').countdown('destroy').remove();
-                        } else {
-                            // teacher updated the timer
-                            var secondsLeft = +input.secondsLeft,
-                                    counterInitialised = $('#countdown').length > 0;
+                    if (input.clearTimer == true) {
+                        // teacher stopped the timer, destroy it
+                        $('#countdown').countdown('destroy').remove();
+                    } else {
+                        // teacher updated the timer
+                        var secondsLeft = +input.secondsLeft,
+                            counterInitialised = $('#countdown').length > 0;
 
-                            if (counterInitialised) {
-                                // just set the new time
-                                $('#countdown').countdown('option', 'until', secondsLeft + 'S');
-                            } else {
-                                // initialise the timer
-                                displayCountdown(secondsLeft);
-                            }
+                        if (counterInitialised) {
+                            // just set the new time
+                            $('#countdown').countdown('option', 'until', secondsLeft + 'S');
+                        } else {
+                            // initialise the timer
+                            displayCountdown(secondsLeft);
                         }
+                    }
 
-                        // reset ping timer
-                        websocketPing('assessmentTimeLimit${sessionMap.assessment.contentId}', true);
-                    });
+                    // reset ping timer
+                    websocketPing('assessmentTimeLimit${sessionMap.assessment.contentId}', true);
+                });
 
             //autocomplete for VSA
             $('.ui-autocomplete-input').each(function(){
@@ -191,7 +192,7 @@
             return totalSelected;
         }
 
-			var counterInitialised = false;
+        var counterInitialised = false;
 
         function displayCountdown(secondsLeft){
             var countdown = '<div id="countdown" role="timer"></div>' +
@@ -345,9 +346,12 @@
                 });
             }
 
-            // only if time limit is not expired
-            if (!isTimelimitExpired && !validateAnswers()) {
-                return;
+            // validate only if time limit is not expired
+            // otherwise confirm with learner that he wants to submit
+            if (!isTimelimitExpired && (!validateAnswers()
+                    || (!isResubmitAllowed &&
+                            !confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learning.submit.all.confirm'/></spring:escapeBody>")))) {
+            return;
             }
 
             disableButtons();
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java
===================================================================
diff -u -rba4898999f40be22618e9225a8d02361cf7c4a0f -r6cd828445d4549e4d114c5333628d812233f0f7a
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java	(.../LearningController.java)	(revision ba4898999f40be22618e9225a8d02361cf7c4a0f)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java	(.../LearningController.java)	(revision 6cd828445d4549e4d114c5333628d812233f0f7a)
@@ -154,9 +154,8 @@
 	request.setAttribute("reflectOnActivity", mindmap.isReflectOnActivity());
 
 	LearningController.storeMindmapCanvasParameters(mindmap, toolSessionID, mindmapUser, mode.toString(),
-		!(mode.equals(ToolAccessMode.TEACHER)
-			|| (mindmap.isLockOnFinished() && mindmapUser.isFinishedActivity())),
-		request);
+		!(mode.equals(ToolAccessMode.TEACHER) || (mindmap.isLockOnFinished()
+			&& mindmapUser.isFinishedActivity())), request);
 
 	if (mindmap.isGalleryWalkStarted()) {
 	    mindmapService.fillGalleryWalkRatings(mindmapDTO, mindmapUser.getUserId());
@@ -197,17 +196,17 @@
 	    List rootNodeList = mindmapService.getRootNodeByMindmapIdAndUserId(mindmap.getUid(), mindmapUser.getUid());
 
 	    if ((rootNodeList == null) || (rootNodeList.size() == 0)) {
-		MindmapNode fromMindmapNode = (MindmapNode) mindmapService
-			.getAuthorRootNodeByMindmapId(mindmap.getUid()).get(0);
+		MindmapNode fromMindmapNode = (MindmapNode) mindmapService.getAuthorRootNodeByMindmapId(
+			mindmap.getUid()).get(0);
 		cloneMindmapNodesForRuntime(fromMindmapNode, null, mindmap, mindmap, mindmapUser, mindmapSession);
 	    }
 	} else {
 	    // clonning Mindmap Nodes for every new session
 	    List rootNodeList = mindmapService.getAuthorRootNodeBySessionId(toolSessionID);
 
 	    if ((rootNodeList == null) || (rootNodeList.size() == 0)) {
-		MindmapNode fromMindmapNode = (MindmapNode) mindmapService
-			.getAuthorRootNodeByMindmapId(mindmap.getUid()).get(0);
+		MindmapNode fromMindmapNode = (MindmapNode) mindmapService.getAuthorRootNodeByMindmapId(
+			mindmap.getUid()).get(0);
 		cloneMindmapNodesForRuntime(fromMindmapNode, null, mindmap, mindmap, null, mindmapSession);
 	    }
 
@@ -232,7 +231,7 @@
 		fromContent.getUid());
 
 	if ((childMindmapNodes != null) && (childMindmapNodes.size() > 0)) {
-	    for (Iterator iterator = childMindmapNodes.iterator(); iterator.hasNext();) {
+	    for (Iterator iterator = childMindmapNodes.iterator(); iterator.hasNext(); ) {
 		MindmapNode childMindmapNode = (MindmapNode) iterator.next();
 		cloneMindmapNodesForRuntime(childMindmapNode, toMindmapNode, fromContent, toContent, user, session);
 	    }
@@ -266,8 +265,8 @@
 	NotifyResponseJSON notifyResponse = null;
 
 	MindmapUser currentUser = mindmapService.getUserByUID(userId);
-	if (currentUser == null
-		|| (mindmapSession.getMindmap().isLockOnFinished() && currentUser.isFinishedActivity())) {
+	if (currentUser == null || (mindmapSession.getMindmap().isLockOnFinished()
+		&& currentUser.isFinishedActivity())) {
 	    notifyResponse = new NotifyResponseJSON(0, null, null);
 	}
 
@@ -322,8 +321,9 @@
 		MindmapNode parentNode = mindmapService.getMindmapNodeByUniqueIdSessionId(parentNodeId, mindmapId,
 			toolSessionId);
 		if (parentNode == null) {
-		    LearningController.log.error("notifyServerAction(): Unable to find parent node: " + parentNodeId
-			    + " toolSessionId " + toolSessionId);
+		    LearningController.log.error(
+			    "notifyServerAction(): Unable to find parent node: " + parentNodeId + " toolSessionId "
+				    + toolSessionId);
 		}
 
 		mindmapService.saveMindmapNode(null, parentNode, uniqueId,
@@ -425,36 +425,48 @@
 	} else {
 	    mindmapNodeList = mindmapService.getRootNodeByMindmapIdAndUserId(mindmapId, userId);
 	}
+	if (mindmapNodeList == null || mindmapNodeList.size() == 0) {
+	    // this happens when a session was not created and Gallery Walk was already started
+	    MindmapSession mindmapSession = mindmapService.getSessionBySessionId(toolSessionId);
+	    if (mindmapSession == null) {
+		throw new IllegalArgumentException("Unable to find Mindmap session with id " + toolSessionId);
+	    }
+	    MindmapNode fromMindmapNode = (MindmapNode) mindmapService.getAuthorRootNodeByMindmapId(mindmap.getUid())
+		    .get(0);
+	    cloneMindmapNodesForRuntime(fromMindmapNode, null, mindmap, mindmap, null, mindmapSession);
+	    mindmapNodeList = mindmapService.getAuthorRootNodeByMindmapSession(mindmapId, toolSessionId);
+	}
 
-	if ((mindmapNodeList != null) && (mindmapNodeList.size() > 0)) {
-	    MindmapNode rootMindmapNode = (MindmapNode) mindmapNodeList.get(0);
+	if (mindmapNodeList == null || mindmapNodeList.size() == 0) {
+	    return null;
+	}
 
-	    String mindmapUserName = null;
-	    if (rootMindmapNode.getUser() == null) {
-		mindmapUserName = mindmapService.getMindmapMessageService().getMessage("node.instructor.label");
-	    } else {
-		mindmapUserName = rootMindmapNode.getUser().getFirstName() + " "
-			+ rootMindmapNode.getUser().getLastName();
-	    }
+	MindmapNode rootMindmapNode = (MindmapNode) mindmapNodeList.get(0);
+	String mindmapUserName = null;
+	if (rootMindmapNode.getUser() == null) {
+	    mindmapUserName = mindmapService.getMindmapMessageService().getMessage("node.instructor.label");
+	} else {
+	    mindmapUserName = rootMindmapNode.getUser().getFirstName() + " " + rootMindmapNode.getUser().getLastName();
+	}
 
-	    NodeModel rootNodeModel = new NodeModel(new NodeConceptModel(rootMindmapNode.getUniqueId(),
-		    rootMindmapNode.getText(), rootMindmapNode.getColor(), mindmapUserName, 0));
+	NodeModel rootNodeModel = new NodeModel(
+		new NodeConceptModel(rootMindmapNode.getUniqueId(), rootMindmapNode.getText(),
+			rootMindmapNode.getColor(), mindmapUserName, 0));
 
-	    NodeModel currentNodeModel = mindmapService.getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(),
-		    mindmapId, rootNodeModel, mindmapUser, monitoring, false,
-		    mindmap.isLockOnFinished() && mindmapUser.isFinishedActivity());
+	NodeModel currentNodeModel = mindmapService.getMindmapXMLFromDatabase(rootMindmapNode.getNodeId(), mindmapId,
+		rootNodeModel, mindmapUser, monitoring, false,
+		mindmap.isLockOnFinished() && mindmapUser.isFinishedActivity());
 
-	    ObjectNode jsonObject = JsonNodeFactory.instance.objectNode();
-	    jsonObject.set("mindmap", new RootJSON(currentNodeModel, mindmap.isMultiUserMode()));
-	    // adding lastActionId
-	    if (mindmap.isMultiUserMode()) {
-		Long lastActionId = mindmapService.getLastGlobalIdByMindmapId(mindmap.getUid(), toolSessionId);
-		jsonObject.put("lastActionId", lastActionId);
-	    }
-	    response.setContentType("application/json;charset=UTF-8");
-	    return jsonObject.toString();
+	ObjectNode jsonObject = JsonNodeFactory.instance.objectNode();
+	jsonObject.set("mindmap", new RootJSON(currentNodeModel, mindmap.isMultiUserMode()));
+	// adding lastActionId
+	if (mindmap.isMultiUserMode()) {
+	    Long lastActionId = mindmapService.getLastGlobalIdByMindmapId(mindmap.getUid(), toolSessionId);
+	    jsonObject.put("lastActionId", lastActionId);
 	}
-	return null;
+	response.setContentType("application/json;charset=UTF-8");
+	return jsonObject.toString();
+
     }
 
     @RequestMapping("/saveLastMindmapChanges")
@@ -487,9 +499,9 @@
 
 	NodeModel rootNodeModel = RootJSON.toNodeModel(mindmapContent);
 	if (rootNodeModel == null) {
-	    String error = new StringBuilder("Unable to save mindmap for session:")
-		    .append(mindmapSession.getSessionName()).append("(").append(mindmapSession.getSessionId())
-		    .append(") user:").append(mindmapUser.getLoginName()).append("(" + mindmapUser.getUserId())
+	    String error = new StringBuilder("Unable to save mindmap for session:").append(
+			    mindmapSession.getSessionName()).append("(").append(mindmapSession.getSessionId()).append(") user:")
+		    .append(mindmapUser.getLoginName()).append("(" + mindmapUser.getUserId())
 		    .append("). No root node. JSON: ").append(mindmapContent).toString();
 	    throw new IOException(error);
 	}
@@ -498,8 +510,8 @@
 	List<NodeModel> branches = rootNodeModel.getBranch();
 
 	// saving root Node into database
-	MindmapNode rootMindmapNode = (MindmapNode) mindmapService
-		.getRootNodeByMindmapIdAndUserId(mindmap.getUid(), mindmapUser.getUid()).get(0);
+	MindmapNode rootMindmapNode = (MindmapNode) mindmapService.getRootNodeByMindmapIdAndUserId(mindmap.getUid(),
+		mindmapUser.getUid()).get(0);
 	rootMindmapNode = mindmapService.saveMindmapNode(rootMindmapNode, null, nodeConceptModel.getId(),
 		nodeConceptModel.getText(), nodeConceptModel.getColor(), mindmapUser, mindmap, mindmapSession);
 
@@ -512,8 +524,9 @@
 	    mindmapService.getChildMindmapNodes(branches, rootMindmapNode, mindmapUser, mindmap, mindmapSession);
 	}
 
-	nodesToDeleteCondition += mindmapService.getNodesToDeleteCondition() + " and mindmap_id = " + mindmap.getUid()
-		+ " and user_id = " + mindmapUser.getUid();
+	nodesToDeleteCondition +=
+		mindmapService.getNodesToDeleteCondition() + " and mindmap_id = " + mindmap.getUid() + " and user_id = "
+			+ mindmapUser.getUid();
 	mindmapService.deleteNodes(nodesToDeleteCondition);
 
 	return rootMindmapNode.getNodeId();
@@ -652,8 +665,9 @@
 	MindmapSession session = mindmapService.getSessionBySessionId(toolSessionID);
 	Mindmap mindmap = session.getMindmap();
 	MindmapUser user = getCurrentUser(toolSessionID, false);
-	boolean contentEditable = mindmap.isGalleryWalkEditEnabled() && user != null
-		&& user.getMindmapSession().getSessionId().equals(toolSessionID);
+	boolean contentEditable =
+		mindmap.isGalleryWalkEditEnabled() && user != null && user.getMindmapSession().getSessionId()
+			.equals(toolSessionID);
 	LearningController.storeMindmapCanvasParameters(mindmap, toolSessionID, user,
 		user == null ? ToolAccessMode.TEACHER.toString() : ToolAccessMode.LEARNER.toString(), contentEditable,
 		request);