Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_admin/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_admin/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_admin/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_central/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_central/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_central/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_central/web/includes/javascript/websocket.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/websocket.js	(revision 0)
+++ lams_central/web/includes/javascript/websocket.js	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -0,0 +1,107 @@
+// websocket needs pinging and reconnection feature in case it fails
+var lamsWebsockets = lamsWebsockets || {};
+
+function isWebsocketClosed(instanceName) {
+    let websocket = lamsWebsockets[instanceName];
+    if (!websocket) {
+        console.error("Websocket not initialized: " + instanceName);
+        return true;
+    }
+    return websocket.instance.readyState == WebSocket.CLOSING
+        || websocket.instance.readyState == WebSocket.CLOSED;
+}
+
+function websocketReconnect(instanceName) {
+    let websocket = lamsWebsockets[instanceName];
+    if (!websocket) {
+        console.error("Websocket not initialized: " + instanceName);
+        return;
+    }
+    if (websocket.reconnectAttempts < 20) {
+        websocket.reconnectAttempts++;
+        // maybe iPad went into sleep mode?
+        // we need this websocket working, so init it again after delay
+        console.log("Reconnecting to websocket in 3 seconds [attempt "
+            + websocket.reconnectAttempts + "/20]: " + instanceName);
+        setTimeout(function (){
+            initWebsocket(instanceName);
+        }, 3000);
+    } else {
+        console.error('Websocket reconnect failed, reloading page: ' + instanceName);
+        alert('Connection issue. The page will now reload.');
+        document.location.reload();
+    }
+}
+
+function websocketPing(instanceName, skipPing){
+    let websocket = lamsWebsockets[instanceName];
+    if (!websocket) {
+        console.error("Websocket not initialized: " + instanceName);
+        return;
+    }
+    if (websocket.instance.readyState == WebSocket.CLOSING
+        || websocket.instance.readyState == WebSocket.CLOSED){
+        websocketReconnect(instanceName);
+        return;
+    }
+
+    if (websocket.pingTimeout)  {
+        clearTimeout(websocket.pingTimeout);
+    }
+
+    // check and ping every 3 minutes
+    websocket.pingTimeout = setTimeout(function (){
+        websocketPing(instanceName);
+    }, 3*60*1000);
+
+    // initial set up does not send ping
+    if (!skipPing) {
+        websocket.instance.send("ping");
+    }
+};
+
+function initWebsocket(instanceName, url){
+    let websocket = lamsWebsockets[instanceName];
+    if (!websocket) {
+        websocket = {
+            initTime : null,
+            url : null,
+            instance : null,
+            pingTimeout : null,
+            reconnectAttempts : 0
+        };
+        lamsWebsockets[instanceName] = websocket;
+    } else if (websocket.instance) {
+        try {
+            websocket.instance.close(1000);
+        } catch (e) {
+            console.error(e);
+        }
+        websocket.instance = null;
+    }
+
+    if (url) {
+        websocket.url = url;
+    }
+
+    websocket.initTime = Date.now();
+    try {
+        websocket.instance = new WebSocket(websocket.url);
+    } catch (e) {
+        console.error(e);
+        websocketReconnect(instanceName);
+        return null;
+    }
+    websocket.instance.onclose = function(e){
+        // check reason and whether the close did not happen immediately after websocket creation
+        // (possible access denied, user logged out?)
+        if (e.code === 1006 && Date.now() - websocket.initTime > 1000) {
+            websocketReconnect(instanceName);
+        }
+    };
+
+    // set up timer for the first time
+    websocketPing(instanceName, true);
+
+    return websocket.instance;
+}
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_gradebook/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_gradebook/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_gradebook/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_learning/lams_learning.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_learning/lams_learning.eml	(.../lams_learning.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_learning/lams_learning.eml	(.../lams_learning.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,29 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
-	<lib name="commons-io-2.5.jar" scope="COMPILE">
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/.sass-cache"/>
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+	</contentEntry>
+	<lib name="commons-io-2.11.0.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-io"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-io"/>
 	</lib>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
 	<lib name="jboss-websocket-api_1.1_spec-1.1.3.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
 	</lib>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_learning/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_learning/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_learning/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_learning/web/includes/javascript/kumalive.js
===================================================================
diff -u -ra5b247dd91cb3ffabf9de46cba029e5537fad087 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_learning/web/includes/javascript/kumalive.js	(.../kumalive.js)	(revision a5b247dd91cb3ffabf9de46cba029e5537fad087)
+++ lams_learning/web/includes/javascript/kumalive.js	(.../kumalive.js)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,10 +1,6 @@
 "use strict"
 
-var kumaliveWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') 
-		+ 'kumaliveWebsocket?organisationID=' + orgId + '&role=' +role),
-	kumaliveWebsocketPingTimeout = null,
-	kumaliveWebsocketPingFunc = null,
-	// is the user a learenr or a teacher
+var // is the user a learenr or a teacher
 	roleTeacher = false,
 	// was the initial set up run
 	initialised = false,
@@ -28,139 +24,106 @@
 		.append($('<div />').addClass('name')),
 	REFRESH_DELAY = 1000,
 	ANIMATION_DURATION = 1000,
-	PING_DELAY = 3*60*1000;
+	websocket = initWebsocket('kumalive' + orgId,
+		LEARNING_URL.replace('http', 'ws')
+		+ 'kumaliveWebsocket?organisationID=' + orgId + '&role=' + role);
 
-kumaliveWebsocketPingFunc = function(skipPing){
-	if (kumaliveWebsocket.readyState == kumaliveWebsocket.CLOSING 
-			|| kumaliveWebsocket.readyState == kumaliveWebsocket.CLOSED){
-		location.reload();
-	}
-	
-	// check and ping every few minutes
-	kumaliveWebsocketPingTimeout = setTimeout(kumaliveWebsocketPingFunc, PING_DELAY);
-	// initial set up does not send ping
-	if (!skipPing) {
-		kumaliveWebsocket.send("ping");
-	}
-};
-// set up timer for the first time
-kumaliveWebsocketPingFunc(true);
+if (websocket) {
+	/**
+	 * Fetches existing Kumalive session
+	 */
+	websocket.onopen = function(e) {
+		websocket.send(JSON.stringify({
+			'type' : 'start'
+		}));
+	};
 
-kumaliveWebsocket.onclose = function(e){
-	// react only on abnormal close
-	if (e.code === 1006) {
-		location.reload();
-	}
-};
-// when the server pushes new messages and roster to the learner's browser
+	// when the server pushes new inputs
+	websocket.onmessage = function (e) {
+		// read JSON object
+		var message = JSON.parse(e.data),
+			type = message.type;
+		// check what is this message about
+		switch(type) {
+			case 'start' : {
+				// user tried to join a Kumalive which is not started yet
+				// try to start it, if user is a teacher
+				// otherwise just wait for a teacher
+				websocket.send(JSON.stringify({
+					'type' : 'start',
+					'role' : role
+				}));
+			}
+				break;
+			case 'create' : {
+				// user is a teacher and will now create a new Kumalive
 
+				// hide splash screen
+				$('#initDiv').hide();
+				// show name input
+				var createDiv = $('#createKumaliveDiv'),
+					rubricsDiv = $('#rubrics .panel-body', createDiv);
+				if (message.rubrics) {
+					$.each(message.rubrics, function(){
+						if (this) {
+							var checkbox = $('<div />').addClass('checkbox').appendTo(rubricsDiv),
+								label = $('<label />').appendTo(checkbox);
+							$('<span />').text(this).appendTo(label);
+							$('<input />').attr('type', 'checkbox')
+								.prop('checked', true)
+								.prependTo(label);
+						}
+					});
+				}
+				// do not show the box at all if there are no rubrics
+				// (exactly: there is the single default blank one)
+				if ($('.checkbox', rubricsDiv).length == 0){
+					rubricsDiv.remove();
+				}
 
-/**
- * Fetches existing Kumalive session
- */
-kumaliveWebsocket.onopen = function(e) {
-	kumaliveWebsocket.send(JSON.stringify({
-		'type' : 'start'
-	}));
-};
-
-/**
- * Display information to an user when he gets disconnected
- */
-kumaliveWebsocket.onclose = function(e){
-	$('body > *').hide();
-	$('#closedDiv').show();
-};
-
-/**
- * Process a message from server.
- */
-kumaliveWebsocket.onmessage = function(e){
-	 // reset ping timer
-    clearTimeout(kumaliveWebsocketPingTimeout);
-    kumaliveWebsocketPingFunc(true);
-    
-	// read JSON object
-	var message = JSON.parse(e.data),
-		type = message.type;
-	// check what is this message about
-	switch(type) {
-		case 'start' : {
-			// user tried to join a Kumalive which is not started yet
-			// try to start it, if user is a teacher
-			// otherwise just wait for a teacher
-			kumaliveWebsocket.send(JSON.stringify({
-				'type' : 'start',
-				'role' : role
-			}));
-		}
-		break;
-		case 'create' : {
-			// user is a teacher and will now create a new Kumalive
-			
-			// hide splash screen
-			$('#initDiv').hide();
-			// show name input
-			var createDiv = $('#createKumaliveDiv'),
-				rubricsDiv = $('#rubrics .panel-body', createDiv);
-			if (message.rubrics) {
-				$.each(message.rubrics, function(){
-					if (this) {
-						var checkbox = $('<div />').addClass('checkbox').appendTo(rubricsDiv),
-							label = $('<label />').appendTo(checkbox);
-						$('<span />').text(this).appendTo(label);
-						$('<input />').attr('type', 'checkbox')
-									  .prop('checked', true)
-									  .prependTo(label);
-					}
-				});
+				var createButton = createDiv.show().children('button').click(create).prop('disabled', true);
+				createDiv.children('input').focus().keyup(function(){
+					// name can not be empty
+					createButton.prop('disabled', !$(this).val());
+				})
 			}
-			// do not show the box at all if there are no rubrics
-			// (exactly: there is the single default blank one)
-			if ($('.checkbox', rubricsDiv).length == 0){
-				rubricsDiv.remove();
+				break;
+			case 'join' : {
+				// server tell user to join Kumalive, so user obeys
+				websocket.send(JSON.stringify({
+					'type' : 'join'
+				}));
 			}
-			
-			var createButton = createDiv.show().children('button').click(create).prop('disabled', true);
-			createDiv.children('input').focus().keyup(function(){
-				// name can not be empty
-				createButton.prop('disabled', !$(this).val());
-			})
-		}
-		break;
-		case 'join' : {
-			// server tell user to join Kumalive, so user obeys
-			kumaliveWebsocket.send(JSON.stringify({
-				'type' : 'join'
-			}));
-		}
-		break;
-		case 'init' : {
-			if (!initialised) {
-				// it is the first refresh message ever
-				init(message);
+				break;
+			case 'init' : {
+				if (!initialised) {
+					// it is the first refresh message ever
+					init(message);
+				}
 			}
-		}
-		break;
-		case 'refresh': {
-			if (refreshing) {
-				// set current message as the next one to be processed
-				queuedMessage = message;
-			} else {
-				// no refresh is running, so process current message
-				processRefresh(message);
+				break;
+			case 'refresh': {
+				if (refreshing) {
+					// set current message as the next one to be processed
+					queuedMessage = message;
+				} else {
+					// no refresh is running, so process current message
+					processRefresh(message);
+				}
 			}
+				break;
+			case 'finish' : {
+				// tell user that Kumalive is finished and close the window
+				window.alert(LABELS.FINISH_KUMALIVE_MESSAGE);
+				window.close();
+			}
+				break;
 		}
-		break;
-		case 'finish' : {
-			// tell user that Kumalive is finished and close the window
-			window.alert(LABELS.FINISH_KUMALIVE_MESSAGE);
-			window.close();
-		}
-		break;
-	} 
-};
 
+		// reset ping timer
+		websocketPing('kumalive' + orgId, true);
+	};
+}
 
 /**
  * Initialise basic Kumalive information when first refresh message arrives
@@ -728,25 +691,25 @@
 }
 
 function raiseHandPrompt() {
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'raiseHandPrompt'
 	}));
 }
 
 function downHandPrompt() {
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'downHandPrompt'
 	}));
 }
 
 function raiseHand() {
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'raiseHand'
 	}));
 }
 
 function downHand() {
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'downHand'
 	}));
 }
@@ -765,14 +728,14 @@
 		return;
 	}
 	
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'speak',
 		'speaker' : speakerId
 	}));
 }
 
 function stopSpeak() {
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'speak'
 	}));
 }
@@ -793,7 +756,7 @@
 	} 
 	
 	if (score !== null) {
-		kumaliveWebsocket.send(JSON.stringify({
+		websocket.send(JSON.stringify({
 			'type'     : 'score',
 			'userID'   : container.attr('userId'),
 			'rubricId' : container.attr('rubricId'),
@@ -964,7 +927,7 @@
 	}
 
 	$('#pollSetup').hide();
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'startPoll',
 		'poll' : poll
 	}));
@@ -979,7 +942,7 @@
 		return;
 	}
 	pollId = null;
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' 		  : 'votePoll',
 		'answerIndex' : checkedAnswer.val()
 	}));
@@ -992,7 +955,7 @@
 	if (!confirm(LABELS.POLL_RELEASE_VOTES_CONFIRM)){
 		return;
 	}
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' 		    : 'releasePollResults',
 		'votesReleased' : true
 	}));
@@ -1006,7 +969,7 @@
 	if (!confirm(LABELS.POLL_RELEASE_VOTERS_CONFIRM)){
 		return;
 	}
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' 		     : 'releasePollResults',
 		'votersReleased' : true
 	}));
@@ -1024,7 +987,7 @@
 	if (!confirm(LABELS.POLL_FINISH_CONFIRM)) {
 		return;
 	}
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'finishPoll',
 		'pollId' : pollId
 	}));
@@ -1036,7 +999,7 @@
  * Hide poll for everyone
  */
 function closePoll() {
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type' : 'closePoll'
 	}));
 }
@@ -1052,7 +1015,7 @@
 	$('#rubrics input:checked', createDiv).each(function(){
 		rubrics.push($(this).siblings('span').text());
 	});
-	kumaliveWebsocket.send(JSON.stringify({
+	websocket.send(JSON.stringify({
 		'type'    : 'start',
 		'role'    : role,
 		'name'    : name,
@@ -1066,7 +1029,7 @@
  */
 function finish(){
 	if (confirm(LABELS.FINISH_KUMALIVE_CONFIRM)) {
-		kumaliveWebsocket.send(JSON.stringify({
+		websocket.send(JSON.stringify({
 			'type' : 'finish'
 		}));
 	}
Index: lams_learning/web/includes/javascript/presence.js
===================================================================
diff -u -rc0afa34ef8004a73b35f396bfb30285043ebce31 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision c0afa34ef8004a73b35f396bfb30285043ebce31)
+++ lams_learning/web/includes/javascript/presence.js	(.../presence.js)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -89,95 +89,68 @@
 			$("#presenceUserCount").html(labelUsers + " (" + users.length + ")");
 		}
 	},
-	
-	presenceWebsocketInitTime = Date.now(),
-	// init the connection with server using server URL but with different protocol
-	presenceWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId),
-	presenceWebsocketPingTimeout = null,
-	presenceWebsocketPingFunc = null;
-	
-	presenceWebsocket.onclose = function(e){
-		// react only on abnormal close
-		if (e.code === 1006 &&
-			Date.now() - presenceWebsocketInitTime > 1000) {
-			location.reload();
-		}
-	};
-	
-	presenceWebsocketPingFunc = function(skipPing){
-		if (presenceWebsocket.readyState == presenceWebsocket.CLOSING || presenceWebsocket.readyState == presenceWebsocket.CLOSED) {
-				return;
-		}
-		
-		// check and ping every 3 minutes
-		presenceWebsocketPingTimeout = setTimeout(presenceWebsocketPingFunc, 3*60*1000);
-		// initial set up does not send ping
-		if (!skipPing) {
-			presenceWebsocket.send("ping");
-		}
-	};
-	// set up timer for the first time
-	presenceWebsocketPingFunc(true);
-	
+	presenceWebsocket = initWebsocket('presence' + lessonId,
+		APP_URL.replace('http', 'ws') + 'presenceChatWebsocket?lessonID=' + lessonId);
 
-	// when the server pushes new messages and roster to the learner's browser
-	presenceWebsocket.onmessage = function(e){
-	  // reset ping timer
-      clearTimeout(presenceWebsocketPingTimeout);
-      presenceWebsocketPingFunc(true);
-		
-	  // create JSON object
-	  var input = JSON.parse(e.data);
-	  if (input.roster) {
-		  roster.updateDisplay(input.roster);
-	  }
-	  
-	  if (input.messages) {
-		  var activeNick = getUserFromTabIndex(presenceChatTabs.tabs('option','active')),
-		  	  selectedTabTag = nickToTag(activeNick);
-		  
-		  jQuery.each(input.messages, function(){
-			  // which tab are we talking about?
-			  var from = this.to ? (this.from == nickname ? this.to : this.from) : groupChatInfo.nick,
-				  lastMessageUid = roster.lastMessageUids[from] || 0;
-			  
-			  // are the messages new?
-			  if (this.uid > lastMessageUid) {
-				  var tag = nickToTag(from);
-				  if (tag != selectedTabTag) {
-					var tab = $("#" + tagToTabLabel(tag));
-					if (tab.length == 0) {
-						// no tab opened yet, create it
-						tab = addTab(from, tag);
+	if (presenceWebsocket) {
+		// when the server pushes new inputs
+		presenceWebsocket.onmessage = function (e) {
+
+			// create JSON object
+			var input = JSON.parse(e.data);
+			if (input.roster) {
+				roster.updateDisplay(input.roster);
+			}
+
+			if (input.messages) {
+				var activeNick = getUserFromTabIndex(presenceChatTabs.tabs('option','active')),
+					selectedTabTag = nickToTag(activeNick);
+
+				jQuery.each(input.messages, function(){
+					// which tab are we talking about?
+					var from = this.to ? (this.from == nickname ? this.to : this.from) : groupChatInfo.nick,
+						lastMessageUid = roster.lastMessageUids[from] || 0;
+
+					// are the messages new?
+					if (this.uid > lastMessageUid) {
+						var tag = nickToTag(from);
+						if (tag != selectedTabTag) {
+							var tab = $("#" + tagToTabLabel(tag));
+							if (tab.length == 0) {
+								// no tab opened yet, create it
+								tab = addTab(from, tag);
+							}
+
+							// notify of new message
+							tab.addClass('presenceTabNewMessage');
+							if (tag != groupChatInfo.tag) {
+								$("#" + tagToListing(tag)).addClass('presenceListingNewMessage');
+							}
+						}
+
+						roster.lastMessageUids[from] = this.uid;
+						var messageArea = $("#" + (nickToMessageArea(from)));
+						messageArea.append(generateMessageHTML(this.from, this.message, this.dateSent));
+						messageArea.scrollTop(messageArea.prop('scrollHeight'));
 					}
-					
-					// notify of new message
-					tab.addClass('presenceTabNewMessage');
-					if (tag != groupChatInfo.tag) {
-						$("#" + tagToListing(tag)).addClass('presenceListingNewMessage');
-					}
-				  }
-				  
-				  roster.lastMessageUids[from] = this.uid;
-				  var messageArea = $("#" + (nickToMessageArea(from)));
-				  messageArea.append(generateMessageHTML(this.from, this.message, this.dateSent));
-				  messageArea.scrollTop(messageArea.prop('scrollHeight'));
-			  }
-		  });  
-	  }
-	  
-		// remove conversation tabs with learners who are gone
-		$('li a', presenceChatTabs).each(function() {
-		  var nick = $(this).text();
-		  if (nick != groupChatInfo.nick && !roster.users[nick]) {
-			  var tag = $(this).attr('href');
-			  $(tag).remove();
-			  $(this).parent().remove();
-			  presenceChatTabs.tabs('refresh');
-		  }
-		});
-	};
+				});
+			}
 
+			// remove conversation tabs with learners who are gone
+			$('li a', presenceChatTabs).each(function() {
+				var nick = $(this).text();
+				if (nick != groupChatInfo.nick && !roster.users[nick]) {
+					var tag = $(this).attr('href');
+					$(tag).remove();
+					$(this).parent().remove();
+					presenceChatTabs.tabs('refresh');
+				}
+			});
+
+			// reset ping timer
+			websocketPing('presence' + lessonId, true);
+		};
+	}
 });
 
 
@@ -307,8 +280,7 @@
 	presenceWebsocket.send(JSON.stringify(data));
 	
 	// reset ping timer
-    clearTimeout(presenceWebsocketPingTimeout);
-    presenceWebsocketPingFunc(true);
+	websocketPing('presence' + lessonId, true);
 }
 
 /* ******* Click handlers ******* */
Index: lams_learning/web/kumalive/kumalive.jsp
===================================================================
diff -u -r4b1e9528c85d7fdf5b6cd05dfb1e105cb65fabb4 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 4b1e9528c85d7fdf5b6cd05dfb1e105cb65fabb4)
+++ lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -19,6 +19,7 @@
 	<lams:JSImport src="includes/javascript/portrait.js" />
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/d3.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/chart.js"></script>
+
 	<script type="text/javascript">
 		"use strict"
 		
@@ -42,6 +43,7 @@
 			};
 			
 	</script>
+	<lams:JSImport src="includes/javascript/websocket.js" />
 	<lams:JSImport src="includes/javascript/kumalive.js" relative="true" />
 </lams:head>
 <body>
Index: lams_learning/web/presenceChat.jsp
===================================================================
diff -u -r4b1e9528c85d7fdf5b6cd05dfb1e105cb65fabb4 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision 4b1e9528c85d7fdf5b6cd05dfb1e105cb65fabb4)
+++ lams_learning/web/presenceChat.jsp	(.../presenceChat.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -36,6 +36,7 @@
 							 tag  : "groupchat"
 							};
 	</script>
+	<lams:JSImport src="includes/javascript/websocket.js" />
 	<lams:JSImport src="includes/javascript/presence.js" relative="true" />
 	<script type="text/javascript">
 		$(document).ready(function() {
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_monitoring/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_monitoring/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_monitoring/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_assessment/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_assessment/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_assessment/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -19,308 +19,277 @@
 <!-- hasEditRight=${hasEditRight} -->
 
 <lams:html>
-<lams:head>
-	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
-	
-	<link rel="stylesheet" type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" />
-	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
-	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jgrowl.css" />
-	<link rel="stylesheet" type="text/css" href="${lams}css/bootstrap-slider.css" />
-	<c:if test="${not empty codeStyles}">
-		<link rel="stylesheet" type="text/css" href="${lams}css/codemirror.css" />
-		<link rel="stylesheet" type="text/css" href="${lams}css/codemirror_simplescrollbars.css" />
-	</c:if>
-	<style>
-		.slider.slider-horizontal {
-			margin-left: 40px;
-		}
-		
-		.question-etherpad {
-			padding: 0;
-		}
-		
-		[data-toggle="collapse"].collapsed .if-not-collapsed,
-		[data-toggle="collapse"]:not(.collapsed) .if-collapsed,
-		.max-word-limit-exceeded {
-  			display: none;
-  		}
-  		
-  		.countdown-timeout {
-  			color: #FF3333 !important;
-  		}
-  		
-  		#leader-info {
-  			margin-bottom: 10px;
-  		}
-	</style>
+	<lams:head>
+		<title><fmt:message key="label.learning.title" /></title>
+		<%@ include file="/common/header.jsp"%>
 
-	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-slider.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
-	
-	<c:if test="${not empty codeStyles}">
-		<script type="text/javascript" src="${lams}includes/javascript/codemirror/codemirror.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/scroll/simplescrollbars.js"></script>
-		<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/selection/active-line.js"></script>
-		<c:if test="${hasEditRight}">
-			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/comment/continuecomment.js"></script>
-			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/edit/closebrackets.js"></script>
-			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/edit/matchbrackets.js"></script>
+		<link rel="stylesheet" type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" />
+		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
+		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.jgrowl.css" />
+		<link rel="stylesheet" type="text/css" href="${lams}css/bootstrap-slider.css" />
+		<c:if test="${not empty codeStyles}">
+			<link rel="stylesheet" type="text/css" href="${lams}css/codemirror.css" />
+			<link rel="stylesheet" type="text/css" href="${lams}css/codemirror_simplescrollbars.css" />
 		</c:if>
+		<style>
+			.slider.slider-horizontal {
+				margin-left: 40px;
+			}
 
-		<script type="text/javascript">
-			CodeMirror.defaults.readOnly = ${!hasEditRight};
-			CodeMirror.defaults.lineNumbers = true;
-			CodeMirror.defaults.continueComments = true;
-			CodeMirror.defaults.autoCloseBrackets = true; 
-			CodeMirror.defaults.matchBrackets = true;
-			CodeMirror.defaults.scrollbarStyle = 'simple';
-			CodeMirror.defaults.styleActiveLine = true;
-		</script>
-	</c:if>
-	<%-- codeStyles is a set, so each code style will be listed only once --%>
-	<c:forEach items="${codeStyles}" var="codeStyle">
-		<c:choose>
-			<c:when test="${codeStyle == 1}">
-				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
-			</c:when>
-			<c:when test="${codeStyle == 2}">
-				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
-			</c:when>
-			<c:when test="${codeStyle >= 3}">
-				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
-			</c:when>
-		</c:choose>
-	</c:forEach>
-	
-	<script type="text/javascript">
-		var skipValidation = false;
-		
-		$(document).ready(function(){
-			//if isLeadershipEnabled - enable/disable submit buttons for hedging marks type of questions
-			if (${isLeadershipEnabled}) {
-				$(".mark-hedging-select").on('change keydown keypress keyup paste', function() {
-					
-					var questionIndex = $(this).data("question-index");					
-					var selects = $("select[name^=question" + questionIndex + "_]");
-					var maxMark = selects.length == 0 ? 0 : eval(selects.first().find('option:last-child').val())
-					var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
-					
-					var isButtonEnabled = (totalSelected == maxMark);
-					
-					//if totalSelected equals to question's maxMark - show button
-					if (isButtonEnabled) {
-						$("[type=button][name=submit-hedging-question" + questionIndex + "]").prop("disabled", "").removeClass("button-disabled");
-					} else {
-						$("[type=button][name=submit-hedging-question" + questionIndex + "]").prop("disabled", "true").addClass("button-disabled");
-					}
-				}).trigger("change");
+			.question-etherpad {
+				padding: 0;
 			}
 
-			//initialize bootstrap-sliders if "Enable confidence level" option is ON
-			$('.bootstrap-slider').bootstrapSlider();
+			[data-toggle="collapse"].collapsed .if-not-collapsed,
+			[data-toggle="collapse"]:not(.collapsed) .if-collapsed,
+			.max-word-limit-exceeded {
+				display: none;
+			}
 
-			//init options sorting feature
-			if (${hasEditRight}) {
-				$("table.ordering-table tbody").each(function () {
-					new Sortable($(this)[0], {
-					    animation: 150,
-					    ghostClass: 'sortable-placeholder',
-					    direction: 'vertical',
-						store: {
-							set: function (sortable) {
-								//update all sequenceIds in order to later save it as options' order
-								for (var i = 0; i < sortable.el.rows.length; i++) {
-									var tr = sortable.el.rows[i];
-									var input = $("input", $(tr));
-								    input.val(i);
+			.countdown-timeout {
+				color: #FF3333 !important;
+			}
+
+			#leader-info {
+				margin-bottom: 10px;
+			}
+		</style>
+
+		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/bootstrap-slider.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
+
+		<c:if test="${not empty codeStyles}">
+			<script type="text/javascript" src="${lams}includes/javascript/codemirror/codemirror.js"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/scroll/simplescrollbars.js"></script>
+			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/selection/active-line.js"></script>
+			<c:if test="${hasEditRight}">
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/comment/continuecomment.js"></script>
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/edit/closebrackets.js"></script>
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/edit/matchbrackets.js"></script>
+			</c:if>
+
+			<script type="text/javascript">
+				CodeMirror.defaults.readOnly = ${!hasEditRight};
+				CodeMirror.defaults.lineNumbers = true;
+				CodeMirror.defaults.continueComments = true;
+				CodeMirror.defaults.autoCloseBrackets = true;
+				CodeMirror.defaults.matchBrackets = true;
+				CodeMirror.defaults.scrollbarStyle = 'simple';
+				CodeMirror.defaults.styleActiveLine = true;
+			</script>
+		</c:if>
+		<%-- codeStyles is a set, so each code style will be listed only once --%>
+		<c:forEach items="${codeStyles}" var="codeStyle">
+			<c:choose>
+				<c:when test="${codeStyle == 1}">
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
+				</c:when>
+				<c:when test="${codeStyle == 2}">
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
+				</c:when>
+				<c:when test="${codeStyle >= 3}">
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
+				</c:when>
+			</c:choose>
+		</c:forEach>
+
+		<script type="text/javascript">
+			var skipValidation = false;
+
+			$(document).ready(function(){
+				//if isLeadershipEnabled - enable/disable submit buttons for hedging marks type of questions
+				if (${isLeadershipEnabled}) {
+					$(".mark-hedging-select").on('change keydown keypress keyup paste', function() {
+
+						var questionIndex = $(this).data("question-index");
+						var selects = $("select[name^=question" + questionIndex + "_]");
+						var maxMark = selects.length == 0 ? 0 : eval(selects.first().find('option:last-child').val())
+						var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
+
+						var isButtonEnabled = (totalSelected == maxMark);
+
+						//if totalSelected equals to question's maxMark - show button
+						if (isButtonEnabled) {
+							$("[type=button][name=submit-hedging-question" + questionIndex + "]").prop("disabled", "").removeClass("button-disabled");
+						} else {
+							$("[type=button][name=submit-hedging-question" + questionIndex + "]").prop("disabled", "true").addClass("button-disabled");
+						}
+					}).trigger("change");
+				}
+
+				//initialize bootstrap-sliders if "Enable confidence level" option is ON
+				$('.bootstrap-slider').bootstrapSlider();
+
+				//init options sorting feature
+				if (${hasEditRight}) {
+					$("table.ordering-table tbody").each(function () {
+						new Sortable($(this)[0], {
+							animation: 150,
+							ghostClass: 'sortable-placeholder',
+							direction: 'vertical',
+							store: {
+								set: function (sortable) {
+									//update all sequenceIds in order to later save it as options' order
+									for (var i = 0; i < sortable.el.rows.length; i++) {
+										var tr = sortable.el.rows[i];
+										var input = $("input", $(tr));
+										input.val(i);
+									}
 								}
 							}
-						}			            
-			        });
-			    });
-			}
+						});
+					});
+				}
 
-			initAssessmentTimeLimitWebsocket();
+				let websocket = initWebsocket('assessmentTimeLimit${sessionMap.assessment.contentId}',
+						'<lams:WebAppURL />'.replace('http', 'ws')
+						+ 'learningWebsocket?toolContentID=${sessionMap.assessment.contentId}');
 
-			//autocomplete for VSA
-			$('.ui-autocomplete-input').each(function(){
-				$(this).autocomplete({
-					'source' : '<c:url value="/learning/vsaAutocomplete.do"/>?questionUid=' + $(this).data("question-uid"),
-					'delay'  : 500,
-					'minLength' : 3
+				if (websocket) {
+					// when the server pushes new inputs
+					websocket.onmessage = 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 (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);
+					};
+				}
+
+				//autocomplete for VSA
+				$('.ui-autocomplete-input').each(function(){
+					$(this).autocomplete({
+						'source' : '<c:url value="/learning/vsaAutocomplete.do"/>?questionUid=' + $(this).data("question-uid"),
+						'delay'  : 500,
+						'minLength' : 3
+					});
 				});
-			});
-			
-			// show etherpads only on Discussion expand
-			$('.question-etherpad-collapse').on('show.bs.collapse', function(){
-				var etherpad = $('.etherpad-container', this);
-				if (!etherpad.hasClass('initialised')) {
-					var id = etherpad.attr('id'),
-						groupId = id.substring('etherpad-container-'.length);
-					etherpadInitMethods[groupId]();
+
+				// show etherpads only on Discussion expand
+				$('.question-etherpad-collapse').on('show.bs.collapse', function(){
+					var etherpad = $('.etherpad-container', this);
+					if (!etherpad.hasClass('initialised')) {
+						var id = etherpad.attr('id'),
+								groupId = id.substring('etherpad-container-'.length);
+						etherpadInitMethods[groupId]();
+					}
+				});
+
+				//check if we came back due to failed answers' validation (missing required question's answer or min words limit not reached)
+				if (${param.isAnswersValidationFailed == true}) {
+					validateAnswers();
 				}
-			});
 
-			<%-- Connect to command websocket only if it is learner UI --%>
-			<c:if test="${isLeadershipEnabled and mode == 'learner'}">
+				<%-- Connect to command websocket only if it is learner UI --%>
+				<c:if test="${isLeadershipEnabled and mode == 'learner'}">
 				// command websocket stuff for refreshing
 				// trigger is an unique ID of page and action that command websocket code in Page.tag recognises
 				commandWebsocketHookTrigger = 'assessment-leader-triggered-refresh-${toolSessionID}';
 				// if the trigger is recognised, the following action occurs
 				commandWebsocketHook = function() {
 					location.reload();
 				};
-			</c:if>
+				</c:if>
 
-			<c:if test="${sessionMap.autoexpandJustification and (!isLeadershipEnabled or isUserLeader)}">
+				<c:if test="${sessionMap.autoexpandJustification and (!isLeadershipEnabled or isUserLeader)}">
 				// auto expand justification panel on first click
 				$('.question-area').find('input, select, .ordering-option').on('click change', function(){
 					$(this).closest('.question-area').children('.answer-justification-container:not(.autoopened)')
-						   .addClass('autoopened').children('.collapse').collapse('show');
+							.addClass('autoopened').children('.collapse').collapse('show');
 				});
-			</c:if>
-		});
-		
-		function countHedgeQuestionSelectTotal(questionIndex) {
-			var totalSelected = 0;
-			$("select[name^=question" + questionIndex + "_]").each(function() {
-				totalSelected += eval(this.value);
+				</c:if>
 			});
-			return totalSelected;
-		}
-		
-		// TIME LIMIT
 
-		// websocket needs pinging and reconnection feature in case it fails
-		// it works pretty much the same as command websocket in Page.tag
-		var assessmentTimeLimitWebsocketInitTime = null,
-			assessmentTimeLimitWebsocket = null,
-			assessmentTimeLimitWebsocketPingTimeout = null,
-			assessmentTimeLimitWebsocketPingFunc = null,
-			assessmentTimeLimitWebsocketReconnectAttempts = 0,
-			counterInitialised = false;
-		
-		assessmentTimeLimitWebsocketPingFunc = function(skipPing){
-			if (assessmentTimeLimitWebsocket.readyState == assessmentTimeLimitWebsocket.CLOSING 
-					|| assessmentTimeLimitWebsocket.readyState == assessmentTimeLimitWebsocket.CLOSED){
-				return;
+			function countHedgeQuestionSelectTotal(questionIndex) {
+				var totalSelected = 0;
+				$("select[name^=question" + questionIndex + "_]").each(function() {
+					totalSelected += eval(this.value);
+				});
+				return totalSelected;
 			}
-			
-			// check and ping every 3 minutes
-			assessmentTimeLimitWebsocketPingTimeout = setTimeout(assessmentTimeLimitWebsocketPingFunc, 3*60*1000);
-			// initial set up does not send ping
-			if (!skipPing) {
-				assessmentTimeLimitWebsocket.send("ping");
-			}
-		};
-			
-		function initAssessmentTimeLimitWebsocket(){
-			assessmentTimeLimitWebsocketInitTime = Date.now();
-			assessmentTimeLimitWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
-					+ 'learningWebsocket?toolContentID=' + ${sessionMap.assessment.contentId});
 
-			assessmentTimeLimitWebsocket.onclose = function(e){
-				// check reason and whether the close did not happen immediately after websocket creation
-				// (possible access denied, user logged out?)
-				if (e.code === 1006 &&
-					Date.now() - assessmentTimeLimitWebsocketInitTime > 1000 &&
-					assessmentTimeLimitWebsocketReconnectAttempts < 20) {
-					assessmentTimeLimitWebsocketReconnectAttempts++;
-					// maybe iPad went into sleep mode?
-					// we need this websocket working, so init it again after delay
-					setTimeout(initAssessmentTimeLimitWebsocket, 3000);
-				}
-			};
+			var counterInitialised = false;
 
-			// set up timer for the first time
-			assessmentTimeLimitWebsocketPingFunc(true);
-			
-			// when the server pushes new inputs
-			assessmentTimeLimitWebsocket.onmessage = 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 (counterInitialised) {
-						// just set the new time
-						$('#countdown').countdown('option', 'until', secondsLeft + 'S');
-					} else {
-						// initialise the timer
-						displayCountdown(secondsLeft);
-					}
-				}
+			function displayCountdown(secondsLeft){
+				var countdown = '<div id="countdown"></div>';
 
-				// reset ping timer
-				clearTimeout(assessmentTimeLimitWebsocketPingTimeout);
-				assessmentTimeLimitWebsocketPingFunc(true);
-			};
-		}
-		
-		function displayCountdown(secondsLeft){
-			var countdown = '<div id="countdown"></div>';
-			
-			$.blockUI({
-				message: countdown, 
-				showOverlay: false,
-				focusInput: false,
-				css: { 
-					top: '40px',
-					left: '',
-					right: '0%',
-			        opacity: '.8', 
-			        width: '230px',
-			        cursor: 'default',
-			        border: 'none'
-		        }   
-			});
-			
-			$('#countdown').countdown({
-				until: '+' + secondsLeft +'S',
-				format: 'hMS',
-				compact: true,
-				alwaysExpire : true,
-				onTick: function(periods) {
-					// check for 30 seconds or less and display timer in red
-					var secondsLeft = $.countdown.periodsToSeconds(periods);
-					if (secondsLeft <= 30) {
-						$(this).addClass('countdown-timeout');
-					} else {
-						$(this).removeClass('countdown-timeout');
+				$.blockUI({
+					message: countdown,
+					showOverlay: false,
+					focusInput: false,
+					css: {
+						top: '40px',
+						left: '',
+						right: '0%',
+						opacity: '.8',
+						width: '230px',
+						cursor: 'default',
+						border: 'none'
 					}
-				},
-				<c:if test="${hasEditRight && (mode != 'teacher')}">
+				});
+
+				$('#countdown').countdown({
+					until: '+' + secondsLeft +'S',
+					format: 'hMS',
+					compact: true,
+					alwaysExpire : true,
+					onTick: function(periods) {
+						// check for 30 seconds or less and display timer in red
+						var secondsLeft = $.countdown.periodsToSeconds(periods);
+						if (secondsLeft <= 30) {
+							$(this).addClass('countdown-timeout');
+						} else {
+							$(this).removeClass('countdown-timeout');
+						}
+					},
+					<c:if test="${hasEditRight && (mode != 'teacher')}">
 					onExpiry: function(periods) {
-				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.learning.blockui.time.is.over" /></spring:escapeBody></h1>' }); 
-				        
-				        setTimeout(function() { 
-				        	submitAll(true);
-				        }, 4000); 
+						if (isWebsocketClosed('assessmentTimeLimit${sessionMap.assessment.contentId}')){
+							console.error('Time limit websocket closed on time expire, reloading page');
+							alert('Connection issue. The page will now reload.');
+							document.location.reload();
+							return;
+						}
+						$.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.learning.blockui.time.is.over" /></spring:escapeBody></h1>' });
+
+						setTimeout(function() {
+							submitAll(true);
+						}, 4000);
 					},
-				</c:if>
-				description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learning.countdown.time.left' /></spring:escapeBody></div>"
-			});
-		}
-			
-		
-		//autosave feature
-		<c:if test="${hasEditRight && (mode != 'teacher')}">
+					</c:if>
+					description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learning.countdown.time.left' /></spring:escapeBody></div>"
+				});
+			}
+
+
+			//autosave feature
+			<c:if test="${hasEditRight && (mode != 'teacher')}">
 			var autosaveInterval = ${isLeadershipEnabled and isUserLeader ? 10000 : 30000}; // 30 or 10 seconds interval
-			
+
 			function learnerAutosave(isCommand){
 				// isCommand means that the autosave was triggered by force complete or another command websocket message
 				// in this case do not check multiple tabs open, just autosave
@@ -330,40 +299,40 @@
 						return;
 					}
 				}
-				
+
 				if (typeof CodeMirror != 'undefined') {
 					$('.CodeMirror').each(function(){
 						this.CodeMirror.save();
 					});
 				}
-				
+
 				//copy value from CKEditor (only available in essay type of questions) to textarea before ajax submit
 				$("textarea[id^='question']").each(function()  {
 					var ckeditorData = CKEDITOR.instances[this.name].getData();
 					//skip out empty values
-					this.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;		
+					this.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;
 				});
 
-				
 
+
 				// copy value from lams:textarea (only available in essay and mark hedging type of questions) to hidden input before ajax submit
 				$("textarea[name$=__textarea]").change();
-				
+
 				//ajax form submit
 				$('#answers').ajaxSubmit({
 					url: "<c:url value='/learning/autoSaveAnswers.do'/>?sessionMapID=${sessionMapID}&date=" + new Date().getTime(),
-	                success: function(response) {
-		                if (response != 'ok') {
-		                	 onLearnerAutosaveError();
-		                	 return;
-			            }
-			            
-		                $.jGrowl(
-		                	"<i class='fa fa-lg fa-floppy-o'></i> <spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learning.draft.autosaved' /></spring:escapeBody>",
-		                	{ life: 2000, closeTemplate: '' }
-		                );
-	                },
-	                error : onLearnerAutosaveError
+					success: function(response) {
+						if (response != 'ok') {
+							onLearnerAutosaveError();
+							return;
+						}
+
+						$.jGrowl(
+								"<i class='fa fa-lg fa-floppy-o'></i> <spring:escapeBody javaScriptEscape='true'><fmt:message key='label.learning.draft.autosaved' /></spring:escapeBody>",
+								{ life: 2000, closeTemplate: '' }
+						);
+					},
+					error : onLearnerAutosaveError
 				});
 			}
 			window.setInterval(learnerAutosave, autosaveInterval);
@@ -372,264 +341,257 @@
 				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.learning.draft.autosave.error" /></spring:escapeBody>');
 				location.reload();
 			}
-		</c:if>
-		
-		//check if we came back due to failed answers' validation (missing required question's answer or min words limit not reached)
-		$(document).ready(function(){
-			if (${param.isAnswersValidationFailed == true}) {
-				validateAnswers();
+			</c:if>
+
+			function disableButtons() {
+				$('.btn').prop('disabled',true);
 			}
-		});
-		
-		function disableButtons() {
-			$('.btn').prop('disabled',true);
-		}
-		
-		function nextPage(pageNumber){
-			if (${assessment.questionsPerPage != -1} && !validateAnswers()) {
-				return;
+
+			function nextPage(pageNumber){
+				if (${assessment.questionsPerPage != -1} && !validateAnswers()) {
+					return;
+				}
+				disableButtons();
+				var myForm = $("#answers");
+				myForm.attr("action", "<c:url value='/learning/nextPage.do?sessionMapID=${sessionMapID}&pageNumber='/>" + pageNumber);
+				myForm.submit();
 			}
-			disableButtons();
-	        var myForm = $("#answers");
-	        myForm.attr("action", "<c:url value='/learning/nextPage.do?sessionMapID=${sessionMapID}&pageNumber='/>" + pageNumber);
-	        myForm.submit();
-		}
-		
-		function submitAll(isTimelimitExpired){
-			if (typeof CodeMirror != 'undefined') {
-				$('.CodeMirror').each(function(){
-					this.CodeMirror.save();
-				});
-			}
-			
-			// only if time limit is not expired
-			if (!isTimelimitExpired && !validateAnswers()) {
-				return;
-			}
-			
-			disableButtons();
 
-			// copy value from lams:textarea (only available in essay and mark hedging type of questions) to hidden input before submit
-			$("textarea[name$=__textarea]").change();
-			
-	        var myForm = $("#answers");
-	        myForm.attr("action", "<c:url value='/learning/submitAll.do?sessionMapID=${sessionMapID}'/>&isTimelimitExpired=" + isTimelimitExpired);
-	        myForm.submit();
-		}
-		
-		function submitSingleMarkHedgingQuestion(singleMarkHedgingQuestionUid, questionIndex){
-			//only if time limit is not expired
-			if ((typeof isTimelimitExpired !== 'undefined') && isTimelimitExpired) {
-				return;
+			function submitAll(isTimelimitExpired){
+				if (typeof CodeMirror != 'undefined') {
+					$('.CodeMirror').each(function(){
+						this.CodeMirror.save();
+					});
+				}
+
+				// only if time limit is not expired
+				if (!isTimelimitExpired && !validateAnswers()) {
+					return;
+				}
+
+				disableButtons();
+
+				// copy value from lams:textarea (only available in essay and mark hedging type of questions) to hidden input before submit
+				$("textarea[name$=__textarea]").change();
+
+				var myForm = $("#answers");
+				myForm.attr("action", "<c:url value='/learning/submitAll.do?sessionMapID=${sessionMapID}'/>&isTimelimitExpired=" + isTimelimitExpired);
+				myForm.submit();
 			}
-			
-			//ajax form submit
-			$('#answers').ajaxSubmit({
-				url: "<c:url value='/learning/submitSingleMarkHedgingQuestion.do'/>?sessionMapID=${sessionMapID}&singleMarkHedgingQuestionUid=" + singleMarkHedgingQuestionUid +"&questionIndex="+ questionIndex +"&date=" + new Date().getTime(),
-				target: '#mark-hedging-question-' + singleMarkHedgingQuestionUid,
-            	success: function() {
-                	$('#question-area-' + questionIndex).removeClass('bg-warning');
-                }
-			});
-		}
-		
-		function validateAnswers() {
-			if (${!hasEditRight}) {
-				return true;
-			}
 
-			if (typeof CodeMirror != 'undefined') {
-				$('.CodeMirror').each(function(){
-					this.CodeMirror.save();
+			function submitSingleMarkHedgingQuestion(singleMarkHedgingQuestionUid, questionIndex){
+				//only if time limit is not expired
+				if ((typeof isTimelimitExpired !== 'undefined') && isTimelimitExpired) {
+					return;
+				}
+
+				//ajax form submit
+				$('#answers').ajaxSubmit({
+					url: "<c:url value='/learning/submitSingleMarkHedgingQuestion.do'/>?sessionMapID=${sessionMapID}&singleMarkHedgingQuestionUid=" + singleMarkHedgingQuestionUid +"&questionIndex="+ questionIndex +"&date=" + new Date().getTime(),
+					target: '#mark-hedging-question-' + singleMarkHedgingQuestionUid,
+					success: function() {
+						$('#question-area-' + questionIndex).removeClass('bg-warning');
+					}
 				});
 			}
-			
-			// copy value from lams:textarea (only available in essay and mark hedging type of questions) to hidden input before submit
-			$("textarea[name$=__textarea]").change();
-			
-			var missingRequiredQuestions = [];
-			var minWordsLimitNotReachedQuestions = [];
-			var markHedgingWrongTotalQuestions = [];
-			
-			<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
+
+			function validateAnswers() {
+				if (${!hasEditRight}) {
+					return true;
+				}
+
+				if (typeof CodeMirror != 'undefined') {
+					$('.CodeMirror').each(function(){
+						this.CodeMirror.save();
+					});
+				}
+
+				// copy value from lams:textarea (only available in essay and mark hedging type of questions) to hidden input before submit
+				$("textarea[name$=__textarea]").change();
+
+				var missingRequiredQuestions = [];
+				var minWordsLimitNotReachedQuestions = [];
+				var markHedgingWrongTotalQuestions = [];
+
+				<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
 				<c:if test="${question.answerRequired}">
-					<c:choose>
-						<c:when test="${question.type == 1}">
-							//multiplechoice
-							if ($("input[name^=question${status.index}]:checked").length == 0) {
-								missingRequiredQuestions.push("${status.index}");
-							}
-						</c:when>
-						
-						<c:when test="${question.type == 2}">
-							//matchingpairs
-							
-	    					var eachSelectHasBeenAnswered = true;
-	    					$("select[name^=question${status.index}_]").each(function() {
-	    						eachSelectHasBeenAnswered &= this.value != -1;
-	    					});
-	    					
-							if (!eachSelectHasBeenAnswered) {
-								missingRequiredQuestions.push("${status.index}");
-							}
+				<c:choose>
+				<c:when test="${question.type == 1}">
+				//multiplechoice
+				if ($("input[name^=question${status.index}]:checked").length == 0) {
+					missingRequiredQuestions.push("${status.index}");
+				}
+				</c:when>
 
-						</c:when>
-						
-						<c:when test="${(question.type == 3) || (question.type == 4) || (question.type == 6 && !question.allowRichEditor and empty question.codeStyle)}">
-							// short answer or numerical or essay without ckeditor or code style
-							var inputText = $("input[name=question${status.index}]")[0];
-							if($.trim(inputText.value).length == 0) {
-								missingRequiredQuestions.push("${status.index}");
-							}
-						</c:when>
-						
-						
-						<c:when test="${question.type == 5}">
-							//truefalse
-							if ($("input[name=question${status.index}]:checked").length == 0) {
-								missingRequiredQuestions.push("${status.index}");
-							}
-						</c:when>
-							
-						<c:when test="${question.type == 6 && question.allowRichEditor}">
-							// essay with ckeditor
-							var ckeditorData = CKEDITOR.instances["question${status.index}"].getData();
-							//can't be null and empty value
-							if((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) {
-								missingRequiredQuestions.push("${status.index}");
-							}
-						</c:when>
-						
-						<c:when test="${question.type == 6 && not empty question.codeStyle}">
-							// essay with code style
-							var textarea = $("textarea[name=question${status.index}]"),
-								codeMirror = textarea.siblings('.CodeMirror')[0],
-								text = codeMirror.CodeMirror.doc.getValue();
+				<c:when test="${question.type == 2}">
+				//matchingpairs
 
-							if($.trim(text).length == 0) {
-								missingRequiredQuestions.push("${status.index}");
-							}
-						</c:when>
-					
-						<c:when test="${question.type == 7}">
-							//ordering - do nothing
-						</c:when>
-							
-						<c:when test="${question.type == 8}">
-							//mark hedging - processed below
-						</c:when>
-					</c:choose>
+				var eachSelectHasBeenAnswered = true;
+				$("select[name^=question${status.index}_]").each(function() {
+					eachSelectHasBeenAnswered &= this.value != -1;
+				});
+
+				if (!eachSelectHasBeenAnswered) {
+					missingRequiredQuestions.push("${status.index}");
+				}
+
+				</c:when>
+
+				<c:when test="${(question.type == 3) || (question.type == 4) || (question.type == 6 && !question.allowRichEditor and empty question.codeStyle)}">
+				// short answer or numerical or essay without ckeditor or code style
+				var inputText = $("input[name=question${status.index}]")[0];
+				if($.trim(inputText.value).length == 0) {
+					missingRequiredQuestions.push("${status.index}");
+				}
+				</c:when>
+
+
+				<c:when test="${question.type == 5}">
+				//truefalse
+				if ($("input[name=question${status.index}]:checked").length == 0) {
+					missingRequiredQuestions.push("${status.index}");
+				}
+				</c:when>
+
+				<c:when test="${question.type == 6 && question.allowRichEditor}">
+				// essay with ckeditor
+				var ckeditorData = CKEDITOR.instances["question${status.index}"].getData();
+				//can't be null and empty value
+				if((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) {
+					missingRequiredQuestions.push("${status.index}");
+				}
+				</c:when>
+
+				<c:when test="${question.type == 6 && not empty question.codeStyle}">
+				// essay with code style
+				var textarea = $("textarea[name=question${status.index}]"),
+						codeMirror = textarea.siblings('.CodeMirror')[0],
+						text = codeMirror.CodeMirror.doc.getValue();
+
+				if($.trim(text).length == 0) {
+					missingRequiredQuestions.push("${status.index}");
+				}
+				</c:when>
+
+				<c:when test="${question.type == 7}">
+				//ordering - do nothing
+				</c:when>
+
+				<c:when test="${question.type == 8}">
+				//mark hedging - processed below
+				</c:when>
+				</c:choose>
 				</c:if>
-				
+
 				//essay question which has min words limit
 				<c:if test="${question.type == 6 && question.minWordsLimit != 0}">
-					var wordCount${status.index} = $('#word-count${status.index}').text();
-					//min words limit is not reached
-					if(wordCount${status.index} < ${question.minWordsLimit}) {
-						minWordsLimitNotReachedQuestions.push("${status.index}");
-					}
+				var wordCount${status.index} = $('#word-count${status.index}').text();
+				//min words limit is not reached
+				if(wordCount${status.index} < ${question.minWordsLimit}) {
+					minWordsLimitNotReachedQuestions.push("${status.index}");
+				}
 				</c:if>
-				
+
 				//mark hedging question and leader aware feature is ON => question is required to answer
 				<c:if test="${question.type == 8}">
-				
-					var questionIndex = ${status.index};
-					
-					if (${isLeadershipEnabled}) {
-						if ($("[type=button][name=submit-hedging-question"+ questionIndex +"]").length > 0) {
-							markHedgingWrongTotalQuestions.push("${status.index}");
-						}
-						
-					} else {
-						var maxMark = ${question.maxMark};
-						var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
-				
-						//if totalSelected not equals to question's maxMark OR textarea is empty or contains only white-space - show warning
-						if (totalSelected != maxMark) {
-							markHedgingWrongTotalQuestions.push("${status.index}");
-						}
+
+				var questionIndex = ${status.index};
+
+				if (${isLeadershipEnabled}) {
+					if ($("[type=button][name=submit-hedging-question"+ questionIndex +"]").length > 0) {
+						markHedgingWrongTotalQuestions.push("${status.index}");
 					}
-					
+
+				} else {
+					var maxMark = ${question.maxMark};
+					var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
+
+					//if totalSelected not equals to question's maxMark OR textarea is empty or contains only white-space - show warning
+					if (totalSelected != maxMark) {
+						markHedgingWrongTotalQuestions.push("${status.index}");
+					}
+				}
+
 				</c:if>
-				
-			</c:forEach>
-			
-			//return true in case all required questions were answered, false otherwise
-			if (missingRequiredQuestions.length == 0 && minWordsLimitNotReachedQuestions.length == 0 
-					&& markHedgingWrongTotalQuestions.length == 0) {
-				return true;
-				
-			} else {
-				<c:if test="${mode == 'author'}">
+
+				</c:forEach>
+
+				//return true in case all required questions were answered, false otherwise
+				if (missingRequiredQuestions.length == 0 && minWordsLimitNotReachedQuestions.length == 0
+						&& markHedgingWrongTotalQuestions.length == 0) {
+					return true;
+
+				} else {
+					<c:if test="${mode == 'author'}">
 					if (!skipValidation) {
 						alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.authoring.preview.skip.validation" /></spring:escapeBody>');
 						skipValidation = true;
 					} else {
 						return true;
 					}
-				</c:if>
-			
-				//remove .bg-warning from all questions
-				$('[id^=question-area-]').removeClass('bg-warning');
-				$('#warning-answers-required').hide();
-				$('#warning-words-limit').hide();
-				$('#warning-mark-hedging-wrong-total').hide();
-				
-				if (missingRequiredQuestions.length != 0) {
-					//add .bg-warning class to those needs to be filled
-					for (i = 0; i < missingRequiredQuestions.length; i++) {
-					    $("#question-area-" + missingRequiredQuestions[i]).addClass('bg-warning');
+					</c:if>
+
+					//remove .bg-warning from all questions
+					$('[id^=question-area-]').removeClass('bg-warning');
+					$('#warning-answers-required').hide();
+					$('#warning-words-limit').hide();
+					$('#warning-mark-hedging-wrong-total').hide();
+
+					if (missingRequiredQuestions.length != 0) {
+						//add .bg-warning class to those needs to be filled
+						for (i = 0; i < missingRequiredQuestions.length; i++) {
+							$("#question-area-" + missingRequiredQuestions[i]).addClass('bg-warning');
+						}
+						//show alert message as well
+						$("#warning-answers-required").show();
+
 					}
-					//show alert message as well
-					$("#warning-answers-required").show();
-					
-				}
-				
-				if (minWordsLimitNotReachedQuestions.length != 0) {
-					//add .bg-warning class to those needs to be filled
-					for (i = 0; i < minWordsLimitNotReachedQuestions.length; i++) {
-					    $("#question-area-" + minWordsLimitNotReachedQuestions[i]).addClass('bg-warning');
+
+					if (minWordsLimitNotReachedQuestions.length != 0) {
+						//add .bg-warning class to those needs to be filled
+						for (i = 0; i < minWordsLimitNotReachedQuestions.length; i++) {
+							$("#question-area-" + minWordsLimitNotReachedQuestions[i]).addClass('bg-warning');
+						}
+						//show alert message as well
+						$("#warning-words-limit").show();
 					}
-					//show alert message as well
-					$("#warning-words-limit").show();		
-				}
-				
-				if (markHedgingWrongTotalQuestions.length != 0) {
-					//add .bg-warning class to those needs to be filled
-					for (i = 0; i < markHedgingWrongTotalQuestions.length; i++) {
-					    $("#question-area-" + markHedgingWrongTotalQuestions[i]).addClass('bg-warning');
+
+					if (markHedgingWrongTotalQuestions.length != 0) {
+						//add .bg-warning class to those needs to be filled
+						for (i = 0; i < markHedgingWrongTotalQuestions.length; i++) {
+							$("#question-area-" + markHedgingWrongTotalQuestions[i]).addClass('bg-warning');
+						}
+						//show alert message as well
+						$("#warning-mark-hedging-wrong-total").show();
 					}
-					//show alert message as well
-					$("#warning-mark-hedging-wrong-total").show();		
+
+					$("html, body").animate({ scrollTop: 0 }, "slow");//window.scrollTo(0, 0);
+
+					return false;
 				}
-				
-				$("html, body").animate({ scrollTop: 0 }, "slow");//window.scrollTo(0, 0);
-				
-				return false;
 			}
-		}
 
-		function getNumberOfWords(value) {
-			var wordsForCounting = value.trim().replace(/['";:,.?\-!]+/g, '');
-			return value ? (value.match(/\S+/g) || []).length : 0;
-		}
+			function getNumberOfWords(value) {
+				var wordsForCounting = value.trim().replace(/['";:,.?\-!]+/g, '');
+				return value ? (value.match(/\S+/g) || []).length : 0;
+			}
 
-		function logLearnerInteractionEvent(eventType, qbToolQuestionUid, optionUid) {
-			$.ajax({
-				url: '<c:url value="/learning/logLearnerInteractionEvent.do"/>',
-				data: {
-					eventType         : eventType,
-					qbToolQuestionUid : qbToolQuestionUid,
-					optionUid         : optionUid
-				},
-				cache : false,
-				type  : 'post',
-				dataType : 'text'
-			});
-		}
-    </script>
-</lams:head>
-<body class="stripes">
+			function logLearnerInteractionEvent(eventType, qbToolQuestionUid, optionUid) {
+				$.ajax({
+					url: '<c:url value="/learning/logLearnerInteractionEvent.do"/>',
+					data: {
+						eventType         : eventType,
+						qbToolQuestionUid : qbToolQuestionUid,
+						optionUid         : optionUid
+					},
+					cache : false,
+					type  : 'post',
+					dataType : 'text'
+				});
+			}
+		</script>
+	</lams:head>
+	<body class="stripes">
 
 	<lams:Page type="learner" title="${assessment.title}">
 		<c:if test="${not empty sessionMap.submissionDeadline && (sessionMap.mode == 'author' || sessionMap.mode == 'learner')}">
@@ -639,59 +601,59 @@
 				</fmt:message>
 			</lams:Alert>
 		</c:if>
-		
+
 		<c:if test="${isLeadershipEnabled}">
 			<lams:LeaderDisplay idName="leader-info"
 								username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
 		</c:if>
-		
+
 		<c:if test="${assessment.allowDiscloseAnswers}">
 			<lams:Alert type="info" close="true">
 				<fmt:message key="label.learning.disclose.tip" />
 			</lams:Alert>
 		</c:if>
-		
+
 		<c:if test="${hasEditRight}">
 			<lams:Alert type="info" close="true">
 				<fmt:message key="label.learning.submit.all.tip" />
 			</lams:Alert>
 		</c:if>
-		
+
 		<div class="panel">
 			<c:out value="${assessment.instructions}" escapeXml="false"/>
 		</div>
-		
+
 		<lams:Alert id="warning-answers-required" type="warning" close="true">
 			<fmt:message key="warn.answers.required" />
 		</lams:Alert>
-		
+
 		<lams:Alert id="warning-words-limit" type="warning" close="true">
 			<fmt:message key="warn.answers.word.requirements.limit" />
 		</lams:Alert>
-		
+
 		<lams:Alert id="warning-mark-hedging-wrong-total" type="warning" close="true">
 			<fmt:message key="warn.mark.hedging.wrong.total" />
 		</lams:Alert>
-		
+
 		<lams:errors/>
 		<br>
-		
+
 		<div class="form-group">
 			<%@ include file="parts/paging.jsp"%>
 			<br>
-			
+
 			<%@ include file="parts/allquestions.jsp"%>
-			
+
 			<%@ include file="parts/paging.jsp"%>
 		</div>
 
 		<c:if test="${mode != 'teacher'}">
 			<div class="space-bottom-top align-right">
-				<c:if test="${hasEditRight}">					
+				<c:if test="${hasEditRight}">
 					<button type="button" name="submitAll"
-							onclick="return submitAll(false);" 
+							onclick="return submitAll(false);"
 							class="btn btn-primary voffset10 pull-right na"
-							>
+					>
 						<fmt:message key="label.learning.submit.all" />
 					</button>
 				</c:if>
@@ -700,5 +662,5 @@
 
 	</lams:Page>
 
-</body>
+	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_chat/lams_tool_chat.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_chat/lams_tool_chat.eml	(.../lams_tool_chat.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_tool_chat/lams_tool_chat.eml	(.../lams_tool_chat.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/.sass-cache"/>
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+	</contentEntry>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
 	</lib>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
 	<lib name="jboss-websocket-api_1.1_spec-1.1.3.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r56017c6190a6a47527f75b8ee75addf686576ed8 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 56017c6190a6a47527f75b8ee75addf686576ed8)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_chat/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r56017c6190a6a47527f75b8ee75addf686576ed8 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_chat/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 56017c6190a6a47527f75b8ee75addf686576ed8)
+++ lams_tool_chat/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_chat/web/includes/javascript/learning.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_chat/web/includes/javascript/learning.js	(.../learning.js)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -15,97 +15,70 @@
 			sendChatToolMessage();
 		}
 	});
-	
+
 	// only Monitor can send a personal message
-	var selectedUser = null,
-		chatWebsocketInitTime = Date.now(),
-		// init the connection with server using server URL but with different protocol
-		chatWebsocket = new WebSocket(APP_URL.replace('http', 'ws')
-				+ 'learningWebsocket?toolSessionID=' + TOOL_SESSION_ID),
-		chatWebsocketPingTimeout = null,
-		chatWebsocketPingFunc = null;
-	
-	chatWebsocket.onclose = function(e){
-		// react only on abnormal close
-		if (e.code === 1006 &&
-			Date.now() - chatWebsocketInitTime > 1000) {
-			location.reload();
-		}
-	};
-	
-	chatWebsocketPingFunc = function(skipPing){
-		if (chatWebsocket.readyState == chatWebsocket.CLOSING 
-				|| chatWebsocket.readyState == chatWebsocket.CLOSED){
-			return;
-		}
-		
-		// check and ping every 3 minutes
-		chatWebsocketPingTimeout = setTimeout(chatWebsocketPingFunc, 3*60*1000);
-		// initial set up does not send ping
-		if (!skipPing) {
-			chatWebsocket.send("ping");
-		}
-	};
-	// set up timer for the first time
-	chatWebsocketPingFunc(true);
+	let selectedUser = null,
+		websocket = initWebsocket('chat' + TOOL_SESSION_ID,
+		APP_URL.replace('http', 'ws')
+		+ 'learningWebsocket?toolSessionID=' + TOOL_SESSION_ID);
 
+	if (websocket) {
+		// when the server pushes new inputs
+		websocket.onmessage = function (e) {
+			// create JSON object
+			var input = JSON.parse(e.data);
+			// clear old messages
+			messageDiv.html('');
 
-	chatWebsocket.onmessage = function(e){
-		// reset ping timer
-		clearTimeout(chatWebsocketPingTimeout);
-		chatWebsocketPingFunc(true);
-		
-		// create JSON object
-		var input = JSON.parse(e.data);
-		// clear old messages
-		messageDiv.html('');
-		
-		// all messasges need to be written out, not only new ones,
-		// as old ones could have been edited or hidden by Monitor
-		jQuery.each(input.messages, function(){
-			var container = $('<div />',{
-				'class' : 'message ' + (this.type == 'chat' ? 'private_message' : '')
+			// all messasges need to be written out, not only new ones,
+			// as old ones could have been edited or hidden by Monitor
+			jQuery.each(input.messages, function(){
+				var container = $('<div />',{
+					'class' : 'message ' + (this.type == 'chat' ? 'private_message' : '')
+				});
+				$('<div />',{
+					'class' : 'messageFrom '+getPortraitColourClass(this.lamsUserId),
+					'text'  : this.from
+				}).appendTo(container);
+				$('<span />',{
+					'text'  : this.body
+				}).appendTo(container);
+
+				container.appendTo(messageDiv);
 			});
-			$('<div />',{
-				'class' : 'messageFrom '+getPortraitColourClass(this.lamsUserId),
-				'text'  : this.from
-			}).appendTo(container);
-			$('<span />',{
-				'text'  : this.body
-			}).appendTo(container);
-				
-			container.appendTo(messageDiv);
-		});
-	  		
-		// move to the bottom
-		messageDiv.scrollTop(messageDiv.prop('scrollHeight'));
-		rosterDiv.html('');
-		jQuery.each(input.roster, function(index, value){
-			var userDiv = $('<div />', {
-				'class' : (value.nickName == selectedUser ? 'selected' : 'unselected'),
-			})
-			  .appendTo(rosterDiv);
 
-			var pictureDivId = 'roster-'+value.lamsUserId;
-			$('<div />', {
-				'id'    : pictureDivId
-			}).appendTo(userDiv);
-			addPortrait(jQuery('#'+pictureDivId), value.portraitId, value.lamsUserId, 'small', true, LAMS_URL);
+			// move to the bottom
+			messageDiv.scrollTop(messageDiv.prop('scrollHeight'));
+			rosterDiv.html('');
+			jQuery.each(input.roster, function(index, value){
+				var userDiv = $('<div />', {
+					'class' : (value.nickName == selectedUser ? 'selected' : 'unselected'),
+				})
+					.appendTo(rosterDiv);
 
-			$('<span />', {
-				'class' : getPortraitColourClass(value.lamsUserId),
-				'text'  : value.nickName
-			}).appendTo(userDiv);			
+				var pictureDivId = 'roster-'+value.lamsUserId;
+				$('<div />', {
+					'id'    : pictureDivId
+				}).appendTo(userDiv);
+				addPortrait(jQuery('#'+pictureDivId), value.portraitId, value.lamsUserId, 'small', true, LAMS_URL);
 
-				
-			// only Monitor can send a personal message
-			if (MODE == 'teacher') {
-				userDiv.click(function(){
-					userSelected($(this));
-				});
-			}
-		});
-		
+				$('<span />', {
+					'class' : getPortraitColourClass(value.lamsUserId),
+					'text'  : value.nickName
+				}).appendTo(userDiv);
+
+
+				// only Monitor can send a personal message
+				if (MODE == 'teacher') {
+					userDiv.click(function(){
+						userSelected($(this));
+					});
+				}
+			});
+
+			// reset ping timer
+			websocketPing('chat' + TOOL_SESSION_ID, true);
+		};
 	}
 	
 	function userSelected(userDiv) {
@@ -138,10 +111,9 @@
 			};
 		
 		// send it to server
-		chatWebsocket.send(JSON.stringify(output));
-		
+		websocket.send(JSON.stringify(output));
+
 		// reset ping timer
-		clearTimeout(chatWebsocketPingTimeout);
-		chatWebsocketPingFunc(true);
+		websocketPing('chat' + TOOL_SESSION_ID, true);
 	}
-});
+});
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_daco/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_daco/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
+++ lams_tool_daco/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_doku/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_doku/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_doku/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_doku/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_doku/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -ree80ff0990f0cd62c18b96ac0b46c60670627da2 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ee80ff0990f0cd62c18b96ac0b46c60670627da2)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,214 +11,191 @@
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
-	
+
 <lams:html>
-<lams:head>
-	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
-	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
-	<style media="screen,projection" type="text/css">
-  		.countdown-timeout {
-  			color: #FF3333 !important;
-  		}		
-  		
-  		#countdown {
-			width: 150px; 
-			font-size: 110%; 
-			font-style: italic; 
-			color:#47bc23;
-			text-align: center;
-		}
-		
-		.lower-to-fit-countdown {
-			margin-top: 55px;
-		}
-	</style>
+	<lams:head>
+		<title><fmt:message key="label.learning.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
+		<style media="screen,projection" type="text/css">
+			.countdown-timeout {
+				color: #FF3333 !important;
+			}
 
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-	<lams:JSImport src="includes/javascript/etherpad.js" />
-	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	<script type="text/javascript">
-		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
-		$(document).ready(function(){
-			// Resize Etherpad iframe when its content grows.
-			// It does not support shrinking, only growing.
-			// This feature requires ep_resize plugin installed in Etherpad and customised with code in Doku tool
-			$(window).on('message onmessage', function (e) {
-				var msg = e.originalEvent.data;
-		        if (msg.name === 'ep_resize') {
-		        	var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
-		        		iframe = $('iframe[src^="' + src + '"]'),
-		            	// height should be no less than 200 px
-		            	height = Math.max(200, msg.data.height + (${hasEditRight and not timeLimitExceeded} ? 10 : 29));
-		           	iframe.height(height);
-		        }
-		    });
-			
-			$('#etherpad-container').pad({
-				'padId':'${padId}',
-				'host':'${etherpadServerUrl}',
-				'lang':'${fn:toLowerCase(localeLanguage)}',
-				'showControls':'${hasEditRight and not timeLimitExceeded}',
-				'showChat':'${dokumaran.showChat}',
-				'showLineNumbers':'${dokumaran.showLineNumbers}',
-				'height':'' + ($(window).height() - 200)
-				<c:if test="${hasEditRight}">
-					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
+			#countdown {
+				width: 150px;
+				font-size: 110%;
+				font-style: italic;
+				color:#47bc23;
+				text-align: center;
+			}
+
+			.lower-to-fit-countdown {
+				margin-top: 55px;
+			}
+		</style>
+
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+		<lams:JSImport src="includes/javascript/etherpad.js" />
+		<lams:JSImport src="learning/includes/javascript/gate-check.js" />
+		<script type="text/javascript">
+			checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+			$(document).ready(function(){
+				// Resize Etherpad iframe when its content grows.
+				// It does not support shrinking, only growing.
+				// This feature requires ep_resize plugin installed in Etherpad and customised with code in Doku tool
+				$(window).on('message onmessage', function (e) {
+					var msg = e.originalEvent.data;
+					if (msg.name === 'ep_resize') {
+						var src = msg.data.location.substring(0, msg.data.location.indexOf('?')),
+								iframe = $('iframe[src^="' + src + '"]'),
+								// height should be no less than 200 px
+								height = Math.max(200, msg.data.height + (${hasEditRight and not timeLimitExceeded} ? 10 : 29));
+						iframe.height(height);
+					}
+				});
+
+				$('#etherpad-container').pad({
+							'padId':'${padId}',
+							'host':'${etherpadServerUrl}',
+							'lang':'${fn:toLowerCase(localeLanguage)}',
+							'showControls':'${hasEditRight and not timeLimitExceeded}',
+							'showChat':'${dokumaran.showChat}',
+							'showLineNumbers':'${dokumaran.showLineNumbers}',
+							'height':'' + ($(window).height() - 200)
+									<c:if test="${hasEditRight}">
+									<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+						,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			});
-			
-			$('[data-toggle="tooltip"]').bootstrapTooltip();
-		});
-		
-		if (${!hasEditRight && mode != "teacher" && !finishedLock}) {
-			setInterval("checkLeaderProgress();", 15000);// Auto-Refresh every 15 seconds for non-leaders
-		}
-		
-		function checkLeaderProgress() {
-	        $.ajax({
-	        	async: false,
-	            url: '<c:url value="/learning/checkLeaderProgress.do"/>',
-	            data: 'toolSessionID=${toolSessionID}',
-	            dataType: 'json',
-	            type: 'post',
-	            success: function (json) {
-	            	if (json.isLeaderResponseFinalized) {
-	            		$("#finish-button, #continue-button").show();
-	            	}
-	            }
-	       	});
-		}
-	
-		function finishSession(){
-			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
-		}
 
+				let websocket = initWebsocket('dokuTimeLimit${sessionMap.toolContentID}',
+								'<lams:WebAppURL />'.replace('http', 'ws')
+								+ 'learningWebsocket?toolContentID=${sessionMap.toolContentID}'),
+						timeLimitExceeded = ${timeLimitExceeded};
 
-		
-		// TIME LIMIT
-		var dokuWebsocketInitTime = Date.now(),
-			dokuWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
-						+ 'learningWebsocket?toolContentID=' + ${sessionMap.toolContentID}),
-			dokuWebsocketPingTimeout = null,
-			dokuWebsocketPingFunc = null;
-		
-		dokuWebsocket.onclose = function(){
-			// react only on abnormal close
-			if (e.code === 1006 &&
-				Date.now() - dokuWebsocketInitTime > 1000) {
-				location.reload();
+				if (websocket) {
+					// when the server pushes new inputs
+					websocket.onmessage = function (e) {
+						// create JSON object
+						var input = JSON.parse(e.data);
+
+						if (input.clearTimer == true) {
+							// teacher stopped the timer, destroy it
+							$('#countdown').countdown('destroy').remove();
+						} else if (typeof input.secondsLeft != 'undefined'){
+							// 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 if (timeLimitExceeded){
+								if (secondsLeft > 0) {
+									// teacher gave extra time, reload to writable Etherpad
+									location.reload();
+									return;
+								}
+							} else {
+								// initialise the timer
+								displayCountdown(secondsLeft);
+							}
+						}
+
+						// reset ping timer
+						websocketPing('dokuTimeLimit${sessionMap.toolContentID}', true);
+					};
+				}
+
+				$('[data-toggle="tooltip"]').bootstrapTooltip();
+			});
+
+			if (${!hasEditRight && mode != "teacher" && !finishedLock}) {
+				setInterval("checkLeaderProgress();", 15000);// Auto-Refresh every 15 seconds for non-leaders
 			}
-		};
-		
-		dokuWebsocketPingFunc = function(skipPing){
-			if (dokuWebsocket.readyState == dokuWebsocket.CLOSING 
-					|| dokuWebsocket.readyState == dokuWebsocket.CLOSED){
-				return;
+
+			function checkLeaderProgress() {
+				$.ajax({
+					async: false,
+					url: '<c:url value="/learning/checkLeaderProgress.do"/>',
+					data: 'toolSessionID=${toolSessionID}',
+					dataType: 'json',
+					type: 'post',
+					success: function (json) {
+						if (json.isLeaderResponseFinalized) {
+							$("#finish-button, #continue-button").show();
+						}
+					}
+				});
 			}
-			
-			// check and ping every 3 minutes
-			dokuWebsocketPingTimeout = setTimeout(dokuWebsocketPingFunc, 3*60*1000);
-			// initial set up does not send ping
-			if (!skipPing) {
-				dokuWebsocket.send("ping");
+
+			function finishSession(){
+				document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			}
-		};
-		
-		// set up timer for the first time
-		dokuWebsocketPingFunc(true);
 
-		var timeLimitExceeded = ${timeLimitExceeded};
-		// run when the server pushes new reports and vote statistics
-		dokuWebsocket.onmessage = function(e) {
-			// create JSON object
-			var input = JSON.parse(e.data);
-	
-			if (input.clearTimer == true) {
-				// teacher stopped the timer, destroy it
-				$('#countdown').countdown('destroy').remove();
-			} else if (typeof input.secondsLeft != 'undefined'){
-				// 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 if (timeLimitExceeded){
-					if (secondsLeft > 0) {
-					    // teacher gave extra time, reload to writable Etherpad
-						location.reload();
-						return;
-					}
-				} else {
-					// initialise the timer
-					displayCountdown(secondsLeft);
-				}
+			function continueReflect(){
+				document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 			}
-			
-			// reset ping timer
-			clearTimeout(dokuWebsocketPingTimeout);
-			dokuWebsocketPingFunc(true);
-		};
 
-		function displayCountdown(secondsLeft){
-			$('#etherpad-panel').addClass('lower-to-fit-countdown');
-			
-			var countdown = '<div id="countdown"></div>';
-			
-			$.blockUI({
-				message: countdown, 
-				showOverlay: false,
-				focusInput: false,
-				css: { 
-					top: '40px',
-					left: '',
-					right: '0%',
-			        opacity: '1', 
-			        width: '150px',
-			        cursor: 'default',
-			        border: 'none'
-		        }   
-			});
-			
-			$('#countdown').countdown({
-				until: '+' + secondsLeft +'S',
-				format: 'hMS',
-				compact: true,
-				alwaysExpire : true,
-				onTick: function(periods) {
-					// check for 30 seconds or less and display timer in red
-					var secondsLeft = $.countdown.periodsToSeconds(periods);
-					if (secondsLeft <= 30) {
-						$(this).addClass('countdown-timeout');
-					} else {
-						$(this).removeClass('countdown-timeout');
+			function displayCountdown(secondsLeft){
+				$('#etherpad-panel').addClass('lower-to-fit-countdown');
+
+				var countdown = '<div id="countdown"></div>';
+
+				$.blockUI({
+					message: countdown,
+					showOverlay: false,
+					focusInput: false,
+					css: {
+						top: '40px',
+						left: '',
+						right: '0%',
+						opacity: '1',
+						width: '150px',
+						cursor: 'default',
+						border: 'none'
 					}
-				},
-				onExpiry: function(periods) {
-			        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape='true'><fmt:message key="label.time.is.over" /></spring:escapeBody></h1>' });
-			        
-			        setTimeout(function() { 
-			        	location.reload();
-			        }, 4000); 
-				},
-				description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.time.left' /></spring:escapeBody></div>"
-			});
-		}
-	</script>
-	
-	<%@ include file="websocket.jsp"%>		
-</lams:head>
-<body class="stripes">
+				});
 
+				$('#countdown').countdown({
+					until: '+' + secondsLeft +'S',
+					format: 'hMS',
+					compact: true,
+					alwaysExpire : true,
+					onTick: function(periods) {
+						// check for 30 seconds or less and display timer in red
+						var secondsLeft = $.countdown.periodsToSeconds(periods);
+						if (secondsLeft <= 30) {
+							$(this).addClass('countdown-timeout');
+						} else {
+							$(this).removeClass('countdown-timeout');
+						}
+					},
+					onExpiry: function(periods) {
+						if (isWebsocketClosed('dokuTimeLimit${sessionMap.toolContentID}')){
+							console.error('Time limit websocket closed on time expire, reloading page');
+							alert('Connection issue. The page will now reload.');
+							document.location.reload();
+							return;
+						}
+						$.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape='true'><fmt:message key="label.time.is.over" /></spring:escapeBody></h1>' });
+
+						setTimeout(function() {
+							location.reload();
+						}, 4000);
+					},
+					description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.time.left' /></spring:escapeBody></div>"
+				});
+			}
+		</script>
+
+		<%@ include file="websocket.jsp"%>
+	</lams:head>
+	<body class="stripes">
+
 	<lams:Page type="learner" title="${dokumaran.title}" style="">
 		<c:if test="${not empty sessionMap.submissionDeadline && (sessionMap.mode == 'author' || sessionMap.mode == 'learner')}">
 			<lams:Alert id="submission-deadline" type="info" close="true">
@@ -227,13 +204,13 @@
 				</fmt:message>
 			</lams:Alert>
 		</c:if>
-		
+
 		<!--  Warnings -->
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
 			<lams:Alert type="danger" id="warn-lock" close="false">
 				<c:choose>
 					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" /> 
+						<fmt:message key="message.activityLocked" />
 					</c:when>
 					<c:otherwise>
 						<fmt:message key="message.warnLockOnFinish" />
@@ -243,10 +220,10 @@
 		</c:if>
 
 		<lams:errors/>
-		
+
 		<p><c:out value="${dokumaran.description}" escapeXml="false" /></p>
-		
-		<div id="etherpad-panel" class='panel panel-default'>			
+
+		<div id="etherpad-panel" class='panel panel-default'>
 			<div id="etherpad-container"></div>
 			<div id="etherpad-containera"></div>
 			<div id="etherpad-containerb"></div>
@@ -264,23 +241,23 @@
 					</div>
 
 					<c:choose>
-					<c:when test="${empty sessionMap.reflectEntry}">
-						<p>
-							<em> 
-								<fmt:message key="message.no.reflection.available" />
-							</em>
-						</p>
-					</c:when>
-					<c:otherwise>
-						<p>
-							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-						</p>
-					</c:otherwise>
+						<c:when test="${empty sessionMap.reflectEntry}">
+							<p>
+								<em>
+									<fmt:message key="message.no.reflection.available" />
+								</em>
+							</p>
+						</c:when>
+						<c:otherwise>
+							<p>
+								<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+							</p>
+						</c:otherwise>
 					</c:choose>
 
 					<c:if test="${mode != 'teacher'}">
 						<button name="ContinueButton" onclick="return continueReflect()" class="btn btn-sm btn-default voffset5">
-						<fmt:message key="label.edit" />
+							<fmt:message key="label.edit" />
 						</button>
 					</c:if>
 				</div>
@@ -303,7 +280,7 @@
 										title="<fmt:message key='label.gallery.walk.wait.start' />"
 									</c:otherwise>
 								</c:choose>
-							>
+						>
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
@@ -318,16 +295,16 @@
 					</c:when>
 					<c:otherwise>
 						<a href="#nogo" name="FinishButton" id="finish-button"
-								class="btn btn-primary voffset5 pull-right na">
+						   class="btn btn-primary voffset5 pull-right na">
 							<span class="nextActivity">
 								<c:choose>
-				 					<c:when test="${sessionMap.isLastActivity}">
-				 						<fmt:message key="label.submit" />
-				 					</c:when>
-				 					<c:otherwise>
-				 		 				<fmt:message key="label.finished" />
-				 					</c:otherwise>
-				 				</c:choose>
+									<c:when test="${sessionMap.isLastActivity}">
+										<fmt:message key="label.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.finished" />
+									</c:otherwise>
+								</c:choose>
 							</span>
 						</a>
 					</c:otherwise>
@@ -336,11 +313,11 @@
 		</c:if>
 
 		<!--closes content-->
-	
+
 		<div id="footer">
 		</div>
 		<!--closes footer-->
 
 	</lams:Page>
-</body>
+	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rabf11f48c3a772c5715c3e5caa1ecc86d62056a8 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision abf11f48c3a772c5715c3e5caa1ecc86d62056a8)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_forum/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rabf11f48c3a772c5715c3e5caa1ecc86d62056a8 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_forum/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision abf11f48c3a772c5715c3e5caa1ecc86d62056a8)
+++ lams_tool_forum/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_gmap/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_gmap/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_gmap/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r1d916bd84f5a4a5057e22ac626ec22716d1149e7 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1d916bd84f5a4a5057e22ac626ec22716d1149e7)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_images/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r1d916bd84f5a4a5057e22ac626ec22716d1149e7 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_images/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 1d916bd84f5a4a5057e22ac626ec22716d1149e7)
+++ lams_tool_images/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_imscc/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_imscc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_imscc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_lamc/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_lamc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_lamc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_laqa/lams_tool_laqa.iml
===================================================================
diff -u -r87a8f85eccc8c32edc96754f3a2c8f88f42f3085 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_laqa/lams_tool_laqa.iml	(.../lams_tool_laqa.iml)	(revision 87a8f85eccc8c32edc96754f3a2c8f88f42f3085)
+++ lams_tool_laqa/lams_tool_laqa.iml	(.../lams_tool_laqa.iml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4" />
\ No newline at end of file
+<module classpath="eclipse" classpath-dir="$MODULE_DIR$" type="JAVA_MODULE" version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <excludeFolder url="file://$MODULE_DIR$/.sass-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/bin" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_laqa/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_laqa/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_laqa/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_larsrc/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rc5e0a719cb2ca1ad3e8f2b33900f140489ce7a63 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_larsrc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision c5e0a719cb2ca1ad3e8f2b33900f140489ce7a63)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_leader/lams_tool_leader.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_leader/lams_tool_leader.eml	(.../lams_tool_leader.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_tool_leader/lams_tool_leader.eml	(.../lams_tool_leader.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,26 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+	</contentEntry>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
 	</lib>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
 	<lib name="jboss-websocket-api_1.1_spec-1.1.3.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_leader/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r1e6fe1dea0f171489ae2ea84569c921d10c2bedc -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_leader/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 1e6fe1dea0f171489ae2ea84569c921d10c2bedc)
+++ lams_tool_leader/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	(.../leaderselection.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -35,6 +35,27 @@
 					show: ${isSelectLeaderActive},
 					keyboard: true
 				});
+
+				let websocket = initWebsocket('leaderSelection${toolSessionID}',
+						'<lams:WebAppURL />'.replace('http', 'ws')
+						+ 'learningWebsocket?toolSessionID=${toolSessionID}');
+
+				if (websocket) {
+					// when the server pushes new inputs
+					websocket.onmessage = function (e) {
+						// no need to reset ping timer as the only possible message is page refresh
+
+						// create JSON object
+						var input = JSON.parse(e.data);
+
+						// The leader has just been selected and all non-leaders should refresh their pages in order
+						// to see new leader's name and a Finish button.
+						if (input.pageRefresh) {
+							location.reload();
+							return;
+						}
+					};
+				}
 			});
 		
 			function leaderSelection() {
@@ -52,54 +73,6 @@
 		    function finishActivity(){
 				location.href = '<c:url value="/learning/finishActivity.do?toolSessionID=${toolSessionID}"/>';
 		    }
-		
-		 	//init the connection with server using server URL but with different protocol
-		 	var leaderWebsocketInitTime = Date.now(),
-		 		leaderWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
-		 			+ 'learningWebsocket?toolSessionID=' + ${toolSessionID}),
-				leaderWebsocketPingTimeout = null,
-				leaderWebsocketPingFunc = null;
-		 	
-		 	leaderWebsocket.onclose = function(e){
-		 		// react only on abnormal close
-		 		if (e.code === 1006 &&
-		 		 	Date.now() - leaderWebsocketInitTime > 1000) {
-		 	 		location.reload();
-		 		}
-		 	};
-		 	
-			leaderWebsocketPingFunc = function(skipPing){
-				if (leaderWebsocket.readyState == leaderWebsocket.CLOSING 
-						|| leaderWebsocket.readyState == leaderWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				leaderWebsocketPingTimeout = setTimeout(leaderWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					leaderWebsocket.send("ping");
-				}
-			};
-			
-			// set up timer for the first time
-			leaderWebsocketPingFunc(true);
-		
-		 	
-			// run when the leader has just been selected
-			leaderWebsocket.onmessage = function(e) {
-				// no need to reset ping timer as the only possible message is page refresh
-				
-				// create JSON object
-				var input = JSON.parse(e.data);
-				
-				// The leader has just been selected and all non-leaders should refresh their pages in order
-		     	// to see new leader's name and a Finish button.
-				if (input.pageRefresh) {
-					location.reload();
-					return;
-				}
-			};
 		</script>
 	</lams:head>
 	
Index: lams_tool_mindmap/lams_tool_mindmap.eml
===================================================================
diff -u -r87a8f85eccc8c32edc96754f3a2c8f88f42f3085 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_mindmap/lams_tool_mindmap.eml	(.../lams_tool_mindmap.eml)	(revision 87a8f85eccc8c32edc96754f3a2c8f88f42f3085)
+++ lams_tool_mindmap/lams_tool_mindmap.eml	(.../lams_tool_mindmap.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/.sass-cache"/>
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+	</contentEntry>
+	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
+		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+	</lib>
+	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
+		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+	</lib>
+	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
+		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+	</lib>
+	<lib name="commons-lang-2.6.jar" scope="COMPILE">
+		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+	</lib>
+	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
+		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+	</lib>
+	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
+		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
 	</levels>
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r8efca897f0ce254dfca5b8c0cf2f8d87b01945e5 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 8efca897f0ce254dfca5b8c0cf2f8d87b01945e5)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_mindmap/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r8efca897f0ce254dfca5b8c0cf2f8d87b01945e5 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_mindmap/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 8efca897f0ce254dfca5b8c0cf2f8d87b01945e5)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_mindmap/web/common/mapjs.jsp
===================================================================
diff -u -r844ffaca6d7137f02508f94278df450891baa480 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 844ffaca6d7137f02508f94278df450891baa480)
+++ lams_tool_mindmap/web/common/mapjs.jsp	(.../mapjs.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%-- <script src="${tool}includes/javascript/mapjs/underscore-min.js"></script> --%>
 <%-- <script src="${tool}includes/javascript/fullscreen.js"></script> --%>
 
+<lams:JSImport src="includes/javascript/websocket.js" />
 <script type="text/javascript">
 
 	var initialActionId = null,  // multiuser request tracking
@@ -59,7 +60,72 @@
 		        </c:if>
 		        contentAggregate = window.mapModel.getIdea();
 		        <c:if  test="${multiMode && contentEditable}">
-		        startWebsocket(initialActionId);
+
+				<%-- Websockets used to get the node updates from the server --%>
+				<%-- init the connection with server using server URL but with different protocol --%>
+				let websocket = initWebsocket('mindmapNodes${sessionId}',
+						'<lams:WebAppURL />'.replace('http', 'ws')
+						+ 'learningWebsocket?toolSessionID=${sessionId}&lastActionId=' + initialActionId);
+
+				if (websocket) {
+					// when the server pushes new inputs
+					websocket.onmessage = function (e) {
+						// create JSON object
+						var response = JSON.parse(e.data);
+
+						if ( ! response.actions ) {
+							return;
+						}
+
+						var valuesChanged = false;
+						for ( i=0; i<response.actions.length; i++ ) {
+							var action = response.actions[i];
+							requestId =  action.actionId;
+							if ( ! action.actionId ) {
+								abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
+								return;
+							}
+							// only process requests we have not done already otherwise we would redo any we trigger
+							if ( requestId > initialActionId && requestsProcessed.indexOf(requestId) == -1 ) {
+								if ( action.type == 0 ) {
+									customRemoveSubIdea(action.nodeId);
+								} else if ( action.type == 1 ) {
+									updateUnsavedNodeIds(action.childNodeId);
+									// add node response.nodeId, response.title, response.color
+									contentAggregate.addSubIdea(action.nodeId, action.title, action.childNodeId);
+									var newChildNode = contentAggregate.findSubIdeaById(action.childNodeId);
+									newChildNode.attr = {};
+									newChildNode.attr.contentLocked = true;
+									newChildNode.creator = action.creator;
+									if ( action.color ) {
+										newChildNode.attr.style = {};
+										newChildNode.attr.style.background = action.color;
+									}
+								} else if ( action.type == 2 ) {
+									// update colour - this call updates the node on screen but also triggers the change
+									// action which will call onIdeaChangedLAMS() - so the change to the other user's node
+									// will need to be ignored.
+									contentAggregate.mergeAttrProperty(action.nodeId, 'style', 'background', action.color);
+								} else if ( action.type == 3 ) {
+									// update title
+									var ideaToUpdate = contentAggregate.findSubIdeaById(action.nodeId);
+									ideaToUpdate.title = action.title;
+								} else {
+									abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
+								}
+								requestsProcessed.push( requestId );
+								updateLastActionId( requestId );
+								valuesChanged = true;
+							}
+						}
+						if ( valuesChanged ) {
+							window.mapModel.rebuildRequired();
+						}
+
+						// reset ping timer
+						websocketPing('mindmapNodes${sessionId}', true);
+					};
+				}
 			    </c:if>
 			},
 			error: function (response) {
@@ -244,115 +310,12 @@
 				return removedNodeIds[link.ideaIdFrom]  || removedNodeIds[link.ideaIdTo];
 			});
 		} 
-		
-		<%-- Websockets used to get the node updates from the server --%>
-		<%-- init the connection with server using server URL but with different protocol --%>
-		var mindmapWebsocketInitTime = null, 
-			mindmapWebsocket = null,
-			mindmapWebsocketPingTimeout = null,
-			mindmapWebsocketPingFunc = null;
 
 		function abortLoad(msg) {
 			alert(msg);
 			window.mapModel.setEditingEnabled(false);
 		}
 
-		mindmapWebsocketPingFunc = function(skipPing){
-			if (mindmapWebsocket.readyState == mindmapWebsocket.CLOSING 
-					|| mindmapWebsocket.readyState == mindmapWebsocket.CLOSED){
-				if (Date.now() - mindmapWebsocketInitTime < 1000) {
-					return;
-				}
-				abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
-			}
-			// check and ping every 3 minutes
-			mindmapWebsocketPingTimeout = setTimeout(mindmapWebsocketPingFunc, 3*60*1000);
-			// initial set up does not send ping
-			if (!skipPing) {
-				mindmapWebsocket.send("ping");
-			}
-		};
-	
-		mindmapWebsocketProcessMessage = function(e) {
-			// create JSON object
-			var response = JSON.parse(e.data);
-			
-			// reset ping timer
-			clearTimeout(mindmapWebsocketPingTimeout);
-			mindmapWebsocketPingFunc(true);
-			
-        		if ( ! response.actions ) {
-        			return;
-        		}
-			        		
-        		var valuesChanged = false;
-        		for ( i=0; i<response.actions.length; i++ ) {
-        			var action = response.actions[i];
-       				requestId =  action.actionId;
-        			if ( ! action.actionId ) {
-        				abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
-        				return;
-        			}
-        			// only process requests we have not done already otherwise we would redo any we trigger
-        			if ( requestId > initialActionId && requestsProcessed.indexOf(requestId) == -1 ) {
-		        		if ( action.type == 0 ) {
-		        			customRemoveSubIdea(action.nodeId);
-		        		} else if ( action.type == 1 ) {
-						updateUnsavedNodeIds(action.childNodeId);
-		        			// add node response.nodeId, response.title, response.color
-						contentAggregate.addSubIdea(action.nodeId, action.title, action.childNodeId);
-		        			var newChildNode = contentAggregate.findSubIdeaById(action.childNodeId);
-						newChildNode.attr = {};
-						newChildNode.attr.contentLocked = true;
-						newChildNode.creator = action.creator;
-		        			if ( action.color ) {
-							newChildNode.attr.style = {};
-			        			newChildNode.attr.style.background = action.color;
-		        			}
-		        		} else if ( action.type == 2 ) {
-		        			// update colour - this call updates the node on screen but also triggers the change
-		        			// action which will call onIdeaChangedLAMS() - so the change to the other user's node
-		        			// will need to be ignored.
-		        			contentAggregate.mergeAttrProperty(action.nodeId, 'style', 'background', action.color);
-		        		} else if ( action.type == 3 ) {
-		        			// update title
-		        			var ideaToUpdate = contentAggregate.findSubIdeaById(action.nodeId);
-		        			ideaToUpdate.title = action.title;    		
-		        		} else {
-						abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
-		        		}
-		        		requestsProcessed.push( requestId );
-        				updateLastActionId( requestId );
-        				valuesChanged = true;
-	        		}
-        		}
-        		if ( valuesChanged ) {
-	        		window.mapModel.rebuildRequired();
-        		}
-		};
-	
-		// websocket communicaton should only be done once the diagram is fully loaded.
-		function startWebsocket(lastActionId) {
-			mindmapWebsocketInitTime = Date.now();
-			mindmapWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws')
-						+ 'learningWebsocket?toolSessionID=' + '${sessionId}' + '&lastActionId=' + lastActionId );
-
-			// run when the server pushes new reports and vote statistics
-			mindmapWebsocket.onmessage = mindmapWebsocketProcessMessage;
-
-			mindmapWebsocket.onclose = function(e){
-				if (e.code === 1006 &&
-					Date.now() - mindmapWebsocketInitTime > 1000) {
-					abortLoad('<fmt:message key="error.unable.to.load.mindmap"/>');
-				}
-			};
-			
-			// set up timer for the first time
-			mindmapWebsocketPingFunc(true);
-		}			
-
-		<%--  End Websockets --%>
-
     </c:when>
 	<c:otherwise>
 		function onIdeaChangedLAMS(action, args, sessionId) {
@@ -482,4 +445,4 @@
 	
 	</div>
 	</div>
-	</div>
+	</div>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_nb/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_nb/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_nb/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r06c8de8a91382c5dec4e999ffe39f7e95ea336c5 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 06c8de8a91382c5dec4e999ffe39f7e95ea336c5)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_notebook/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r06c8de8a91382c5dec4e999ffe39f7e95ea336c5 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_notebook/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 06c8de8a91382c5dec4e999ffe39f7e95ea336c5)
+++ lams_tool_notebook/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_pixlr/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_pixlr/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_preview/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_preview/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_preview/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_sbmt/lams_tool_sbmt.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_sbmt/lams_tool_sbmt.eml	(.../lams_tool_sbmt.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_tool_sbmt/lams_tool_sbmt.eml	(.../lams_tool_sbmt.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,23 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+	</contentEntry>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
 	</lib>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_sbmt/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_sbmt/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_scratchie/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -ra9eba90bfa617a1db2a0bee02e9904ce05413d9a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scratchie/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision a9eba90bfa617a1db2a0bee02e9904ce05413d9a)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r79123cc650a4028c6dfa0e931d9a074b07234be3 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 79123cc650a4028c6dfa0e931d9a074b07234be3)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -323,8 +323,65 @@
 		}
 
 		<c:if test="${mode != 'teacher'}">
-			// time limit feature
-			
+			$(document).ready(function(){
+				// time limit feature
+				let websocket = initWebsocket('scratchieTimeLimit${scratchie.contentId}',
+						'<lams:WebAppURL />'.replace('http', 'ws')
+						+ 'learningWebsocket?toolSessionID=${toolSessionID}&toolContentID=${scratchie.contentId}');
+
+				if (websocket) {
+					// when the server pushes new inputs
+					websocket.onmessage = function (e) {
+
+						// create JSON object
+						var input = JSON.parse(e.data);
+
+						if (input.pageRefresh) {
+							location.reload();
+							return;
+						}
+
+						if (input.clearTimer == true) {
+							// teacher stopped the timer, destroy it
+							$('#countdown').countdown('destroy').remove();
+						} else if (typeof input.secondsLeft != 'undefined'){
+							// 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);
+							}
+						} else if (${not isUserLeader}){
+							// reflect the leader's choices
+							$.each(input, function(itemUid, options) {
+								$.each(options, function(optionUid, optionProperties){
+
+									if (optionProperties.isVSA) {
+										var answer = optionUid;
+										optionUid = hashCode(optionUid);
+
+										//check if such image exists, create it otherwise
+										if ($('#image-' + itemUid + '-' + optionUid).length == 0) {
+											paintNewVsaAnswer(eval(itemUid), answer);
+										}
+									}
+
+									scratchImage(itemUid, optionUid, optionProperties.isCorrect);
+								});
+							});
+						}
+
+						// reset ping timer
+						websocketPing('scratchieTimeLimit${scratchie.contentId}', true);
+					};
+				}
+			});
+
 			function displayCountdown(secondsLeft){
 				var countdown = '<div id="countdown"></div>' 
 				$.blockUI({
@@ -357,6 +414,12 @@
 						}
 					},
 					onExpiry: function(periods) {
+						if (isWebsocketClosed('scratchieTimeLimit${scratchie.contentId}')){
+							console.error('Time limit websocket closed on time expire, reloading page');
+							alert('Connection issue. The page will now reload.');
+							document.location.reload();
+							return;
+						}
 				        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.time.is.over" /></spring:escapeBody></h1>' }); 
 				        
 				        setTimeout(function() { 
@@ -370,88 +433,6 @@
 					description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.countdown.time.left' /></spring:escapeBody></div>"
 				});
 			}
-	
-			//init the connection with server using server URL but with different protocol
-			var scratchieWebsocketInitTime = Date.now(),
-				scratchieWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
-							+ 'learningWebsocket?toolSessionID=' + ${toolSessionID} + '&toolContentID=' + ${scratchie.contentId}),
-				scratchieWebsocketPingTimeout = null,
-				scratchieWebsocketPingFunc = null;
-			
-			scratchieWebsocket.onclose = function(e) {
-				// react only on abnormal close
-				if (e.code === 1006 &&
-					Date.now() - scratchieWebsocketInitTime > 1000) {
-					location.reload();		
-				}
-			};
-			
-			scratchieWebsocketPingFunc = function(skipPing){
-				if (scratchieWebsocket.readyState == scratchieWebsocket.CLOSING 
-						|| scratchieWebsocket.readyState == scratchieWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				scratchieWebsocketPingTimeout = setTimeout(scratchieWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					scratchieWebsocket.send("ping");
-				}
-			};
-			
-			// set up timer for the first time
-			scratchieWebsocketPingFunc(true);
-			
-			// run when the server pushes new reports and vote statistics
-			scratchieWebsocket.onmessage = function(e) {
-				// create JSON object
-				var input = JSON.parse(e.data);
-
-				if (input.pageRefresh) {
-					location.reload();
-					return;
-				}
-			
-				if (input.clearTimer == true) {
-					// teacher stopped the timer, destroy it
-					$('#countdown').countdown('destroy').remove();
-				} else if (typeof input.secondsLeft != 'undefined'){
-					// 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);
-					}
-				} else if (${not isUserLeader}){
-					// reflect the leader's choices
-					$.each(input, function(itemUid, options) {
-						$.each(options, function(optionUid, optionProperties){
-							
-							if (optionProperties.isVSA) {
-								var answer = optionUid;
-								optionUid = hashCode(optionUid);
-	
-								//check if such image exists, create it otherwise
-								if ($('#image-' + itemUid + '-' + optionUid).length == 0) {
-									paintNewVsaAnswer(eval(itemUid), answer);
-								}
-							}
-							
-							scratchImage(itemUid, optionUid, optionProperties.isCorrect);
-						});
-					});
-				}
-				
-				// reset ping timer
-				clearTimeout(scratchieWebsocketPingTimeout);
-				scratchieWebsocketPingFunc(true);
-			};
 		</c:if>
 			
 		
Index: lams_tool_scribe/lams_tool_scribe.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/lams_tool_scribe.eml	(.../lams_tool_scribe.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_tool_scribe/lams_tool_scribe.eml	(.../lams_tool_scribe.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,26 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+	</contentEntry>
 	<lib name="jboss-websocket-api_1.1_spec-1.1.3.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
 	</lib>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_scribe/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-	
 
+
 <%@ include file="/common/taglibs.jsp"%>
 
 <lams:html>
@@ -10,172 +10,144 @@
 	<c:set var="tool">
 		<lams:WebAppURL />
 	</c:set>
-	
+
 	<lams:head>
 		<title>
 			<fmt:message key="activity.title" />
 		</title>
 		<lams:css/>
-		
+
 		<lams:JSImport src="includes/javascript/common.js" />
 		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-	
+
 		<script type="text/javascript">
-	
+
 		</script>
 	</lams:head>
-	
+
 	<body class="stripes">
-		<c:set var="tool">
-			<lams:WebAppURL />
-		</c:set>
-		
-		<c:set var="appointedScribe">
-			<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
-		</c:set>
-		
-		<script type="text/javascript" src='<lams:LAMSURL/>includes/javascript/jquery.js'></script>
-		<script type="text/javascript">
-			//init the connection with server using server URL but with different protocol
-			var scribeWebsocketInitTime = Date.now(), 
-				scribeWebsocket = new WebSocket('${tool}'.replace('http', 'ws')
-							+ 'learningWebsocket?toolSessionID=' + ${scribeSessionDTO.sessionID}),
-				scribeWebsocketPingTimeout = null,
-				scribeWebsocketPingFunc = null,
-				agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />',
-				reportSubmitted = ${scribeSessionDTO.reportSubmitted};
-				
-			scribeWebsocket.onclose = function(e){
-				if (e.code === 1006 &&
-					Date.now() - scribeWebsocketInitTime > 1000) {
-					location.reload();
-				}
-			};
-				
-			scribeWebsocketPingFunc = function(skipPing){
-				if (scribeWebsocket.readyState == scribeWebsocket.CLOSING 
-						|| scribeWebsocket.readyState == scribeWebsocket.CLOSED){
-					if (Date.now() - scribeWebsocketInitTime < 1000) {
+	<c:set var="tool">
+		<lams:WebAppURL />
+	</c:set>
+
+	<c:set var="appointedScribe">
+		<c:out value="${scribeSessionDTO.appointedScribe}" escapeXml="true" />
+	</c:set>
+
+	<script type="text/javascript" src='<lams:LAMSURL/>includes/javascript/jquery.js'></script>
+	<script type="text/javascript">
+		let scribeWebsocket = null;
+		$(document).ready(function() {
+			scribeWebsocket = initWebsocket('scribe${scribeSessionDTO.sessionID}',
+					'${tool}'.replace('http', 'ws')
+					+ 'learningWebsocket?toolSessionID=${scribeSessionDTO.sessionID}');
+
+			if (scribeWebsocket) {
+				// when the server pushes new inputs
+				scribeWebsocket.onmessage = function (e) {
+					// create JSON object
+					var input = JSON.parse(e.data),
+							agreeButton = $('#agreeButton').parent();
+
+					// if the scribe or monitor force completes the activity, reload to display report page
+					if (input.close) {
+						window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
 						return;
 					}
-					location.reload();
-				}
-				
-				// check and ping every 3 minutes
-				scribeWebsocketPingTimeout = setTimeout(scribeWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					scribeWebsocket.send("ping");
-				}
-			};
-			
-			// set up timer for the first time
-			scribeWebsocketPingFunc(true);
-			
-			// run when the server pushes new reports and vote statistics
-			scribeWebsocket.onmessage = function(e) {
-				// create JSON object
-				var input = JSON.parse(e.data),
-					agreeButton = $('#agreeButton').parent();
-				
-				// if the scribe or monitor force completes the activity, reload to display report page
-				if (input.close) {
-					window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
-					return;
-				}
-		
-				// reset ping timer
-				clearTimeout(scribeWebsocketPingTimeout);
-				scribeWebsocketPingFunc(true);
-				
-				// only changed reports will be sent
-				if (input.reports) {
-					reportSubmitted = true;
-					$.each(input.reports, function() {
-						$('#reportText-' + this.uid).html(this.text);
-					});
-				}
-				
-				// can the user vote
-				if (!reportSubmitted || input.approved) {
-					agreeButton.hide();
-				} else {
-					agreeButton.show();
-				}
-				
-				// update vote statistics
-				var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
-													.replace('{1}', input.numberOfLearners);
-				$('#agreementPercentageLabel').text(label);
-				$('#agreementPercentage').text('(' + input.votePercentage + '%)');
-				$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
-											.css('width',input.votePercentage + '%');
-			};
-			
-			function submitApproval() {
-				var agreeButton = $('#agreeButton').parent(),
+
+					// only changed reports will be sent
+					if (input.reports) {
+						reportSubmitted = true;
+						$.each(input.reports, function() {
+							$('#reportText-' + this.uid).html(this.text);
+						});
+					}
+
+					// can the user vote
+					if (!reportSubmitted || input.approved) {
+						agreeButton.hide();
+					} else {
+						agreeButton.show();
+					}
+
+					// update vote statistics
+					var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
+							.replace('{1}', input.numberOfLearners);
+					$('#agreementPercentageLabel').text(label);
+					$('#agreementPercentage').text('(' + input.votePercentage + '%)');
+					$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
+							.css('width',input.votePercentage + '%');
+
+					// reset ping timer
+					websocketPing('scribe${scribeSessionDTO.sessionID}', true);
+				};
+			}
+		});
+
+		function submitApproval() {
+			var agreeButton = $('#agreeButton').parent(),
 					data = {
-						type : 'vote'	
+						type : 'vote'
 					};
-				scribeWebsocket.send(JSON.stringify(data));
-				
-				agreeButton.hide();
-			}
-		</script>
-		
-		<lams:Page type="learner" title="${scribeDTO.title}">
-		
-			<div class="panel">
-				<c:out value="${scribeDTO.instructions}" escapeXml="false" />
-			</div>
-		
-			<%@include file="/pages/parts/voteDisplay.jsp"%>
-		
-			<h4>
-				<abbr class="pull-right hidden-xs"
-					title="<fmt:message key="message.learnerInstructions2" ><fmt:param value="${appointedScribe}"/></fmt:message>&nbsp;<fmt:message key="message.learnerInstructions3" />"><i
+			scribeWebsocket.send(JSON.stringify(data));
+
+			agreeButton.hide();
+		}
+	</script>
+
+	<lams:Page type="learner" title="${scribeDTO.title}">
+
+		<div class="panel">
+			<c:out value="${scribeDTO.instructions}" escapeXml="false" />
+		</div>
+
+		<%@include file="/pages/parts/voteDisplay.jsp"%>
+
+		<h4>
+			<abbr class="pull-right hidden-xs"
+				  title="<fmt:message key="message.learnerInstructions2" ><fmt:param value="${appointedScribe}"/></fmt:message>&nbsp;<fmt:message key="message.learnerInstructions3" />"><i
 					class="fa fa-question-circle text-info"></i></abbr>
-				<fmt:message key="heading.report" />
-			</h4>
-			<p class="help-block" style="font-size: 12px"><fmt:message key="activity.title"/>: ${appointedScribe}</p>
-		
-				<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-		
-					<div class="row">
-						<div class="col-xs-12">
-							<div class="panel panel-default">
-								<div class="panel-heading panel-title">
-									<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
-								</div>
-								<div class="panel-body">
-									<abbr class="pull-right hidden-xs" title="<fmt:message key="label.scribe.posted" />"><i
-										class="fa fa-xs fa-question-circle text-info"></i></abbr>
-		
-									<c:set var="entry">
-										<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
-									</c:set>
-									<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
-								</div>
-							</div>
+			<fmt:message key="heading.report" />
+		</h4>
+		<p class="help-block" style="font-size: 12px"><fmt:message key="activity.title"/>: ${appointedScribe}</p>
+
+		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
+
+			<div class="row">
+				<div class="col-xs-12">
+					<div class="panel panel-default">
+						<div class="panel-heading panel-title">
+							<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
 						</div>
+						<div class="panel-body">
+							<abbr class="pull-right hidden-xs" title="<fmt:message key="label.scribe.posted" />"><i
+									class="fa fa-xs fa-question-circle text-info"></i></abbr>
+
+							<c:set var="entry">
+								<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
+							</c:set>
+							<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
+						</div>
 					</div>
-		
-				</c:forEach>
-		
-				<div class="row">
-					<div class="col-xs-12" id="agreeButton">
-						<button class="btn btn-success pull-left" onClick="javascript:submitApproval()">
-							<fmt:message key="button.agree" />
-						</button>
-					</div>
 				</div>
-		
-		
-			<div id="footer"></div>
-		
-		</lams:Page>
-			
+			</div>
+
+		</c:forEach>
+
+		<div class="row">
+			<div class="col-xs-12" id="agreeButton">
+				<button class="btn btn-success pull-left" onClick="javascript:submitApproval()">
+					<fmt:message key="button.agree" />
+				</button>
+			</div>
+		</div>
+
+
+		<div id="footer"></div>
+
+	</lams:Page>
+
 	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,199 +9,177 @@
 			<fmt:message key="activity.title" />
 		</title>
 		<lams:css/>
-		
+
 		<lams:JSImport src="includes/javascript/common.js" />
 		<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
 	</lams:head>
-	
+
 	<body class="stripes">
-		
-		<script type="text/javascript" src='${lams}includes/javascript/jquery.js'></script>
-		<script type="text/javascript">
-			$(document).ready(function(){
-				// focus on the first report input
-				$('textarea[id^="report-"]').first().focus();
-			});
-		
-			//init the connection with server using server URL but with different protocol
-			var scribeWebsocket = new WebSocket('${tool}'.replace('http', 'ws')
-							+ 'learningWebsocket?toolSessionID=' + ${scribeSessionDTO.sessionID}),
-				scribeWebsocketPingTimeout = null,
-				scribeWebsocketPingFunc = null,
+
+	<script type="text/javascript" src='${lams}includes/javascript/jquery.js'></script>
+	<script type="text/javascript">
+		let reportSubmitted = ${scribeSessionDTO.reportSubmitted},
 				agreementPercentageLabel = '<fmt:message key="message.voteStatistics" />',
-				reportSubmitted = ${scribeSessionDTO.reportSubmitted};
-				
-			scribeWebsocketPingFunc = function(skipPing){
-				if (scribeWebsocket.readyState == scribeWebsocket.CLOSING 
-						|| scribeWebsocket.readyState == scribeWebsocket.CLOSED){
-					location.reload();
-				}
-				
-				// check and ping every 3 minutes
-				scribeWebsocketPingTimeout = setTimeout(scribeWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					scribeWebsocket.send("ping");
-				}
-			};
-			// set up timer for the first time
-			scribeWebsocketPingFunc(true);
-		 	
-		 	scribeWebsocket.onclose = function(e){
-		 		// react only on abnormal close
-		 		if (e.code === 1006) {
-		 	 		location.reload();
-		 		}
-		 	};
-		 	
-			// run when the server pushes new reports and vote statistics
-			scribeWebsocket.onmessage = function(e) {
-				// create JSON object
-				var input = JSON.parse(e.data),
-					agreeButton = $('#agreeButton');
-				
-				// if the scribe or monitor force completes the activity, reload to display report page
-				if (input.close) {
-					window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
-					return;
-				}
-				
-				// reset ping timer
-				clearTimeout(scribeWebsocketPingTimeout);
-				scribeWebsocketPingFunc(true);
-				
-				// only changed reports will be sent
-				if (input.reports) {
-					$.each(input.reports, function() {
-						$('#reportText-' + this.uid).html(this.text);
-					});
-				}
-				
-				// can the user vote
-				if (!reportSubmitted || input.approved) {
-					agreeButton.hide();
-				} else {
-					agreeButton.show();
-				}
-				
-				// update vote statistics 
-				var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
-													.replace('{1}', input.numberOfLearners);
-				$('#agreementPercentageLabel').text(label);
-				$('#agreementPercentage').text('(' + input.votePercentage + '%)');
-				$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
-											.css('width',input.votePercentage + '%');
+				scribeWebsocket	= null;
+
+		$(document).ready(function(){
+			// focus on the first report input
+			$('textarea[id^="report-"]').first().focus();
+
+			scribeWebsocket = initWebsocket('scribe${scribeSessionDTO.sessionID}',
+					'${tool}'.replace('http', 'ws')
+					+ 'learningWebsocket?toolSessionID=${scribeSessionDTO.sessionID}');
+
+			if (scribeWebsocket) {
+				// when the server pushes new inputs
+				scribeWebsocket.onmessage = function (e) {
+					// create JSON object
+					var input = JSON.parse(e.data),
+							agreeButton = $('#agreeButton');
+
+					// if the scribe or monitor force completes the activity, reload to display report page
+					if (input.close) {
+						window.location.href = '${tool}learning.do?toolSessionID=${scribeSessionDTO.sessionID}&mode=${MODE}';
+						return;
+					}
+
+					// only changed reports will be sent
+					if (input.reports) {
+						$.each(input.reports, function() {
+							$('#reportText-' + this.uid).html(this.text);
+						});
+					}
+
+					// can the user vote
+					if (!reportSubmitted || input.approved) {
+						agreeButton.hide();
+					} else {
+						agreeButton.show();
+					}
+
+					// update vote statistics
+					var label = agreementPercentageLabel.replace('{0}', input.numberOfVotes)
+							.replace('{1}', input.numberOfLearners);
+					$('#agreementPercentageLabel').text(label);
+					$('#agreementPercentage').text('(' + input.votePercentage + '%)');
+					$('#agreementPercentageBar').attr('aria-valuenow', input.votePercentage)
+							.css('width',input.votePercentage + '%');
+
+					// reset ping timer
+					websocketPing('scribe${scribeSessionDTO.sessionID}', true);
+				};
 			}
-			
-			function submitApproval() {
-				var data = {
-						type : 'vote'	
-					};
-				scribeWebsocket.send(JSON.stringify(data));
-				
-				$('#agreeButton').hide();
-			}
-			
-			function submitReport() {
-				var reports = [],
+		});
+
+		function submitApproval() {
+			var data = {
+				type : 'vote'
+			};
+			scribeWebsocket.send(JSON.stringify(data));
+
+			$('#agreeButton').hide();
+		}
+
+		function submitReport() {
+			var reports = [],
 					data = {
-						type : 'submitReport'	
+						type : 'submitReport'
 					};
-				// get each report part (heading) text
-				$('textarea[id^="report-"]').each(function(){
-					reports.push({
-						'uid'  : $(this).attr('id').split('-')[1],
-						'text' : $(this).val() 
-					});
+			// get each report part (heading) text
+			$('textarea[id^="report-"]').each(function(){
+				reports.push({
+					'uid'  : $(this).attr('id').split('-')[1],
+					'text' : $(this).val()
 				});
-				data.reports = reports;
-				scribeWebsocket.send(JSON.stringify(data));
-				
-				reportSubmitted = true;
-			}
-		
-			function confirmForceComplete() {
-				return confirm("<fmt:message key='message.confirmForceComplete'/>");
-			}
-		</script>
-		
-		<lams:Page type="learner" title="${scribeDTO.title}">
-		
-			<div class="panel">
-				<c:out value="${scribeDTO.instructions}" escapeXml="false" />		
-			</div>
-		
-			<div id="voteDisplay">
-				<%@include file="/pages/parts/voteDisplay.jsp"%>
-			</div>
-		
-			<h4>
-				<abbr class="pull-right hidden-xs" title="<fmt:message key="message.scribeInstructions2" />&nbsp;<fmt:message key="message.scribeInstructions3" />"><i
-											class="fa fa-question-circle text-info"></i></abbr>
-				<fmt:message key="heading.report" />
-			</h4>
-			<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-				<div class="row">
-					<div class="col-xs-12">
-						<div class="panel panel-default">
-							<div class="panel-heading panel-title">
-								<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
-							</div>
-							<div class="panel-body">
-		
-								<div class="panel-warning panel-body bg-warning">
-									<abbr class="pull-right hidden-xs" title="<fmt:message key="label.what.others.see" />"><i
+			});
+			data.reports = reports;
+			scribeWebsocket.send(JSON.stringify(data));
+
+			reportSubmitted = true;
+		}
+
+		function confirmForceComplete() {
+			return confirm("<fmt:message key='message.confirmForceComplete'/>");
+		}
+	</script>
+
+	<lams:Page type="learner" title="${scribeDTO.title}">
+
+		<div class="panel">
+			<c:out value="${scribeDTO.instructions}" escapeXml="false" />
+		</div>
+
+		<div id="voteDisplay">
+			<%@include file="/pages/parts/voteDisplay.jsp"%>
+		</div>
+
+		<h4>
+			<abbr class="pull-right hidden-xs" title="<fmt:message key="message.scribeInstructions2" />&nbsp;<fmt:message key="message.scribeInstructions3" />"><i
+					class="fa fa-question-circle text-info"></i></abbr>
+			<fmt:message key="heading.report" />
+		</h4>
+		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
+			<div class="row">
+				<div class="col-xs-12">
+					<div class="panel panel-default">
+						<div class="panel-heading panel-title">
+							<c:out value="${reportDTO.headingDTO.headingText}" escapeXml="false" />
+						</div>
+						<div class="panel-body">
+
+							<div class="panel-warning panel-body bg-warning">
+								<abbr class="pull-right hidden-xs" title="<fmt:message key="label.what.others.see" />"><i
 										class="fa fa-xs fa-question-circle text-info"></i></abbr>
-		
-									<c:set var="entry">
-										<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
-									</c:set>
-									<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
-								</div>
-		
-								<c:if test="${not scribeUserDTO.finishedActivity}">
-									<textarea id="report-${reportDTO.uid}" rows="6"
-										class="form-control voffset5">${reportDTO.entryText}</textarea>
-								</c:if>
+
+								<c:set var="entry">
+									<lams:out value="${reportDTO.entryText}" escapeHtml="true" />
+								</c:set>
+								<span id="reportText-${reportDTO.uid}"><c:out value="${entry}" escapeXml="false" /></span>
 							</div>
+
+							<c:if test="${not scribeUserDTO.finishedActivity}">
+									<textarea id="report-${reportDTO.uid}" rows="6"
+											  class="form-control voffset5">${reportDTO.entryText}</textarea>
+							</c:if>
 						</div>
 					</div>
 				</div>
-			</c:forEach>
-		
-			<c:if test="${not scribeUserDTO.finishedActivity}">
-				<div class="row">
-					<div class="col-xs-12" id="submitReportBtn">
-						<button class="btn btn-sm btn-default pull-right" onClick="javascript:submitReport()">
-							<fmt:message key="button.submitReport" />
-						</button>
-					</div>
-				</div>
-			</c:if>
-			<hr>
-		
-			<form:form action="forceCompleteActivity.do" modelAttribute="learningForm" onsubmit="return confirmForceComplete();">
-				<input type="hidden" name="scribeUserUID" value="${scribeUserDTO.uid}" />
-				<form:hidden path="mode" />
-		
-				<div id="forceCompleteBtn">
-					<button class="btn btn-primary pull-right">
-						<fmt:message key="button.forceComplete" />
+			</div>
+		</c:forEach>
+
+		<c:if test="${not scribeUserDTO.finishedActivity}">
+			<div class="row">
+				<div class="col-xs-12" id="submitReportBtn">
+					<button class="btn btn-sm btn-default pull-right" onClick="javascript:submitReport()">
+						<fmt:message key="button.submitReport" />
 					</button>
 				</div>
-			</form:form>
-		
-			<div id="agreeButton">
-				<a id="agreeButton" class="btn btn-success pull-left" onclick="javascript:submitApproval();"> 
-					<fmt:message key="button.agree" />
-				</a>
 			</div>
-		
-			<div id="footer"></div>
-		
-		</lams:Page>
-			
+		</c:if>
+		<hr>
+
+		<form:form action="forceCompleteActivity.do" modelAttribute="learningForm" onsubmit="return confirmForceComplete();">
+			<input type="hidden" name="scribeUserUID" value="${scribeUserDTO.uid}" />
+			<form:hidden path="mode" />
+
+			<div id="forceCompleteBtn">
+				<button class="btn btn-primary pull-right">
+					<fmt:message key="button.forceComplete" />
+				</button>
+			</div>
+		</form:form>
+
+		<div id="agreeButton">
+			<a id="agreeButton" class="btn btn-success pull-left" onclick="javascript:submitApproval();">
+				<fmt:message key="button.agree" />
+			</a>
+		</div>
+
+		<div id="footer"></div>
+
+	</lams:Page>
+
 	</body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r5c35317b80afad33a9b22f93ac1238098d3d16e1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 5c35317b80afad33a9b22f93ac1238098d3d16e1)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r5c35317b80afad33a9b22f93ac1238098d3d16e1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 5c35317b80afad33a9b22f93ac1238098d3d16e1)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rde3d3bdf91f546742d7b037c6392830d19f2ef02 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision de3d3bdf91f546742d7b037c6392830d19f2ef02)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_survey/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rde3d3bdf91f546742d7b037c6392830d19f2ef02 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_survey/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision de3d3bdf91f546742d7b037c6392830d19f2ef02)
+++ lams_tool_survey/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rd23158e8034ca47e6ba1e3628d6241064a6056f8 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d23158e8034ca47e6ba1e3628d6241064a6056f8)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_task/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rd23158e8034ca47e6ba1e3628d6241064a6056f8 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_task/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision d23158e8034ca47e6ba1e3628d6241064a6056f8)
+++ lams_tool_task/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_vote/lams_tool_vote.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_vote/lams_tool_vote.eml	(.../lams_tool_vote.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_tool_vote/lams_tool_vote.eml	(.../lams_tool_vote.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,23 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+	</contentEntry>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
 	</lib>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -raa1bcddda0a1f03ce15790e7f6d70ac9b0525f88 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision aa1bcddda0a1f03ce15790e7f6d70ac9b0525f88)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_vote/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -raa1bcddda0a1f03ce15790e7f6d70ac9b0525f88 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_vote/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision aa1bcddda0a1f03ce15790e7f6d70ac9b0525f88)
+++ lams_tool_vote/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_whiteboard/lams_tool_whiteboard.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_whiteboard/lams_tool_whiteboard.eml	(.../lams_tool_whiteboard.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_tool_whiteboard/lams_tool_whiteboard.eml	(.../lams_tool_whiteboard.eml)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -1,29 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+	</contentEntry>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
 	<lib name="jboss-websocket-api_1.1_spec-1.1.3.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/websocket"/>
 	</lib>
 	<lib name="jackson-core-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="jackson-databind-2.9.5.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/jackson"/>
 	</lib>
 	<lib name="javax.persistence-api-2.2.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/persistence-api"/>
 	</lib>
 	<lib name="hibernate-core-5.3.6.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/hibernate-core"/>
 	</lib>
-	<lib name="commons-io-2.5.jar" scope="COMPILE">
+	<lib name="commons-io-2.11.0.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-io"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-io"/>
 	</lib>
 	<lib name="jboss-servlet-api_4.0_spec-1.0.0.Final.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
+		<relative-module-src project-related="file://$3RDPARTY_SOURCES_PROJECT_47$/servlet-api"/>
 	</lib>
 	<levels>
 		<level name="3rdParty" value="project"/>
Index: lams_tool_whiteboard/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r85a2af65cb5f008ebb4f38b1431b7f9482330f4b -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 85a2af65cb5f008ebb4f38b1431b7f9482330f4b)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_whiteboard/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r85a2af65cb5f008ebb4f38b1431b7f9482330f4b -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_whiteboard/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 85a2af65cb5f008ebb4f38b1431b7f9482330f4b)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_whiteboard/web/pages/learning/learning.jsp
===================================================================
diff -u -r85a2af65cb5f008ebb4f38b1431b7f9482330f4b -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 85a2af65cb5f008ebb4f38b1431b7f9482330f4b)
+++ lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,243 +11,221 @@
 <c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 <c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
 <c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
-	
+
 <lams:html>
-<lams:head>
-	<title><fmt:message key="label.learning.title" /></title>
-	<%@ include file="/common/header.jsp"%>
-	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
-	<style media="screen,projection" type="text/css">
-  		.countdown-timeout {
-  			color: #FF3333 !important;
-  		}		
-  		
-  		#countdown {
-			width: 150px; 
-			font-size: 110%; 
-			font-style: italic; 
-			color:#47bc23;
-			text-align: center;
-		}
-				
-		#whiteboard-frame {
-			width: 100%;
-			height: 700px;
-			margin-bottom: 20px;
-			border: 1px solid #c1c1c1;
-		}
-		
-		.full-screen-launch-button {
-			margin-bottom: 5px;
-		}
-		
-		.full-screen-exit-button {
-			display: none;
-			margin-bottom: 5px;
-		}
+	<lams:head>
+		<title><fmt:message key="label.learning.title" /></title>
+		<%@ include file="/common/header.jsp"%>
+		<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
+		<style media="screen,projection" type="text/css">
+			.countdown-timeout {
+				color: #FF3333 !important;
+			}
 
-		.full-screen-content-div.fullscreen {
-			padding: 20px 30px 70px 0;
-		}
-		
-		.full-screen-content-div.fullscreen .full-screen-flex-div {
-			margin: 0 2%;
-		}
-		
-		.full-screen-content-div.fullscreen .full-screen-flex-div,
-		.full-screen-content-div.fullscreen .full-screen-main-div,
-		.full-screen-content-div.fullscreen #whiteboard-frame {
-			height: 100%;
-			width: 100%;
-		}
-	</style>
+			#countdown {
+				width: 150px;
+				font-size: 110%;
+				font-style: italic;
+				color:#47bc23;
+				text-align: center;
+			}
 
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
-	<lams:JSImport src="learning/includes/javascript/gate-check.js" />
-	
-	<script type="text/javascript">
-		checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
-		
-		$(document).ready(function(){
-			$('[data-toggle="tooltip"]').bootstrapTooltip();
+			#whiteboard-frame {
+				width: 100%;
+				height: 700px;
+				margin-bottom: 20px;
+				border: 1px solid #c1c1c1;
+			}
 
-			// Use container-fluid just for this tool
-			$('.panel-learner-page').closest('.container').removeClass('container').addClass('container-fluid');
-			
-			setupFullScreenEvents();
-			document.addEventListener("fullscreenchange", whiteboardFullScreenChanged);
-			document.addEventListener("mozfullscreenchange", whiteboardFullScreenChanged);
-			document.addEventListener("webkitfullscreenchange", whiteboardFullScreenChanged);
-			document.addEventListener("msfullscreenchange", whiteboardFullScreenChanged);
-		});
-		
-		if (${!hasEditRight && mode != "teacher" && !finishedLock}) {
-			setInterval("checkLeaderProgress();", 15000);// Auto-Refresh every 15 seconds for non-leaders
-		}
-		
-		function checkLeaderProgress() {
-	        $.ajax({
-	        	async: false,
-	            url: '<c:url value="/learning/checkLeaderProgress.do"/>',
-	            data: 'toolSessionID=${toolSessionID}',
-	            dataType: 'json',
-	            type: 'post',
-	            success: function (json) {
-	            	if (json.isLeaderResponseFinalized) {
-	            		$("#finish-button, #continue-button").show();
-	            	}
-	            }
-	       	});
-		}
-	
-		function finishSession(){
-			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
-		}
-		
-		function continueReflect(){
-			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
-		}
+			.full-screen-launch-button {
+				margin-bottom: 5px;
+			}
 
+			.full-screen-exit-button {
+				display: none;
+				margin-bottom: 5px;
+			}
 
-		
-		// TIME LIMIT
-		var whiteboardWebsocketInitTime = Date.now(),
-			whiteboardWebsocket = new WebSocket('<lams:WebAppURL />'.replace('http', 'ws') 
-						+ 'learningWebsocket?toolContentID=' + ${sessionMap.toolContentID}),
-			whiteboardWebsocketPingTimeout = null,
-			whiteboardWebsocketPingFunc = null;
-		
-		whiteboardWebsocket.onclose = function(){
-			// react only on abnormal close
-			if (e.code === 1006 &&
-				Date.now() - whiteboardWebsocketInitTime > 1000) {
-				location.reload();
+			.full-screen-content-div.fullscreen {
+				padding: 20px 30px 70px 0;
 			}
-		};
-		
-		whiteboardWebsocketPingFunc = function(skipPing){
-			if (whiteboardWebsocket.readyState == whiteboardWebsocket.CLOSING 
-					|| whiteboardWebsocket.readyState == whiteboardWebsocket.CLOSED){
-				return;
+
+			.full-screen-content-div.fullscreen .full-screen-flex-div {
+				margin: 0 2%;
 			}
-			
-			// check and ping every 3 minutes
-			whiteboardWebsocketPingTimeout = setTimeout(whiteboardWebsocketPingFunc, 3*60*1000);
-			// initial set up does not send ping
-			if (!skipPing) {
-				whiteboardWebsocket.send("ping");
+
+			.full-screen-content-div.fullscreen .full-screen-flex-div,
+			.full-screen-content-div.fullscreen .full-screen-main-div,
+			.full-screen-content-div.fullscreen #whiteboard-frame {
+				height: 100%;
+				width: 100%;
 			}
-		};
-		
-		// set up timer for the first time
-		whiteboardWebsocketPingFunc(true);
+		</style>
 
-		var timeLimitExceeded = ${timeLimitExceeded};
-		// run when the server pushes new reports and vote statistics
-		whiteboardWebsocket.onmessage = function(e) {
-			// create JSON object
-			var input = JSON.parse(e.data);
-	
-			if (input.clearTimer == true) {
-				// teacher stopped the timer, destroy it
-				$('#countdown').countdown('destroy').remove();
-			} else if (typeof input.secondsLeft != 'undefined'){
-				// 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 if (timeLimitExceeded){
-					if (secondsLeft > 0) {
-					    // teacher gave extra time, reload to writable Whiteboard
-						location.reload();
-						return;
-					}
-				} else {
-					// initialise the timer
-					displayCountdown(secondsLeft);
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
+		<lams:JSImport src="learning/includes/javascript/gate-check.js" />
+
+		<script type="text/javascript">
+			checkNextGateActivity('finish-button', '${toolSessionID}', '', finishSession);
+
+			$(document).ready(function(){
+				$('[data-toggle="tooltip"]').bootstrapTooltip();
+
+				// Use container-fluid just for this tool
+				$('.panel-learner-page').closest('.container').removeClass('container').addClass('container-fluid');
+
+				setupFullScreenEvents();
+				document.addEventListener("fullscreenchange", whiteboardFullScreenChanged);
+				document.addEventListener("mozfullscreenchange", whiteboardFullScreenChanged);
+				document.addEventListener("webkitfullscreenchange", whiteboardFullScreenChanged);
+				document.addEventListener("msfullscreenchange", whiteboardFullScreenChanged);
+
+
+				let websocket = initWebsocket('whiteboardTimeLimit${sessionMap.toolContentID}',
+								'<lams:WebAppURL />'.replace('http', 'ws')
+								+ 'learningWebsocket?toolContentID=${sessionMap.toolContentID}'),
+						timeLimitExceeded = ${timeLimitExceeded};
+
+				if (websocket) {
+					// when the server pushes new inputs
+					websocket.onmessage = function (e) {
+						// create JSON object
+						var input = JSON.parse(e.data);
+
+						if (input.clearTimer == true) {
+							// teacher stopped the timer, destroy it
+							$('#countdown').countdown('destroy').remove();
+						} else if (typeof input.secondsLeft != 'undefined'){
+							// 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 if (timeLimitExceeded){
+								if (secondsLeft > 0) {
+									// teacher gave extra time, reload to writable Whiteboard
+									location.reload();
+									return;
+								}
+							} else {
+								// initialise the timer
+								displayCountdown(secondsLeft);
+							}
+						}
+
+						// reset ping timer
+						websocketPing('whiteboardTimeLimit${sessionMap.toolContentID}', true);
+					};
 				}
+			});
+
+			if (${!hasEditRight && mode != "teacher" && !finishedLock}) {
+				setInterval("checkLeaderProgress();", 15000);// Auto-Refresh every 15 seconds for non-leaders
 			}
-			
-			// reset ping timer
-			clearTimeout(whiteboardWebsocketPingTimeout);
-			whiteboardWebsocketPingFunc(true);
-		};
 
-		function displayCountdown(secondsLeft){
-			var countdown = '<div id="countdown"></div>';
-			
-			$.blockUI({
-				message: countdown, 
-				showOverlay: false,
-				focusInput: false,
-				css: { 
-					top: '40px',
-					left: '',
-					right: '0%',
-			        opacity: '1', 
-			        width: '150px',
-			        cursor: 'default',
-			        border: 'none'
-		        }   
-			});
-			
-			$('#countdown').countdown({
-				until: '+' + secondsLeft +'S',
-				format: 'hMS',
-				compact: true,
-				alwaysExpire : true,
-				onTick: function(periods) {
-					// check for 30 seconds or less and display timer in red
-					var secondsLeft = $.countdown.periodsToSeconds(periods);
-					if (secondsLeft <= 30) {
-						$(this).addClass('countdown-timeout');
-					} else {
-						$(this).removeClass('countdown-timeout');
+			function checkLeaderProgress() {
+				$.ajax({
+					async: false,
+					url: '<c:url value="/learning/checkLeaderProgress.do"/>',
+					data: 'toolSessionID=${toolSessionID}',
+					dataType: 'json',
+					type: 'post',
+					success: function (json) {
+						if (json.isLeaderResponseFinalized) {
+							$("#finish-button, #continue-button").show();
+						}
 					}
-				},
-				onExpiry: function(periods) {
-			        $.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.time.is.over" /></spring:escapeBody></h1>' }); 
-			        
-			        setTimeout(function() { 
-			        	location.reload();
-			        }, 4000); 
-				},
-				description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.time.left' /></spring:escapeBody></div>"
-			});
-		}
+				});
+			}
 
-		function whiteboardFullScreenChanged() {
-			var fullscreenElement = document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement;
-			$('.full-screen-content-div').toggleClass('fullscreen', fullscreenElement && fullscreenElement != null);
-		}
-	</script>
-	
-	<%@ include file="websocket.jsp"%>		
-</lams:head>
-<body class="stripes">
+			function finishSession(){
+				document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
+			}
 
+			function continueReflect(){
+				document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+			}
+
+			function displayCountdown(secondsLeft){
+				var countdown = '<div id="countdown"></div>';
+
+				$.blockUI({
+					message: countdown,
+					showOverlay: false,
+					focusInput: false,
+					css: {
+						top: '40px',
+						left: '',
+						right: '0%',
+						opacity: '1',
+						width: '150px',
+						cursor: 'default',
+						border: 'none'
+					}
+				});
+
+				$('#countdown').countdown({
+					until: '+' + secondsLeft +'S',
+					format: 'hMS',
+					compact: true,
+					alwaysExpire : true,
+					onTick: function(periods) {
+						// check for 30 seconds or less and display timer in red
+						var secondsLeft = $.countdown.periodsToSeconds(periods);
+						if (secondsLeft <= 30) {
+							$(this).addClass('countdown-timeout');
+						} else {
+							$(this).removeClass('countdown-timeout');
+						}
+					},
+					onExpiry: function(periods) {
+						if (isWebsocketClosed('whiteboardTimeLimit${sessionMap.toolContentID}')){
+							console.error('Time limit websocket closed on time expire, reloading page');
+							alert('Connection issue. The page will now reload.');
+							document.location.reload();
+							return;
+						}
+						$.blockUI({ message: '<h1 id="timelimit-expired"><i class="fa fa-refresh fa-spin fa-1x fa-fw"></i><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.time.is.over" /></spring:escapeBody></h1>' });
+
+						setTimeout(function() {
+							location.reload();
+						}, 4000);
+					},
+					description: "<div id='countdown-label'><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.time.left' /></spring:escapeBody></div>"
+				});
+			}
+
+			function whiteboardFullScreenChanged() {
+				var fullscreenElement = document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement;
+				$('.full-screen-content-div').toggleClass('fullscreen', fullscreenElement && fullscreenElement != null);
+			}
+		</script>
+
+		<%@ include file="websocket.jsp"%>
+	</lams:head>
+	<body class="stripes">
+
 	<lams:Page type="learner" title="${whiteboard.title}" style="">
-	
+
 		<c:if test="${not empty sessionMap.submissionDeadline && (sessionMap.mode == 'author' || sessionMap.mode == 'learner')}">
 			<lams:Alert id="submission-deadline" type="info" close="true">
 				<fmt:message key="authoring.info.teacher.set.restriction" >
 					<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
 				</fmt:message>
 			</lams:Alert>
 		</c:if>
-		
+
 		<!--  Warnings -->
 		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
 			<lams:Alert type="danger" id="warn-lock" close="false">
 				<c:choose>
 					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" /> 
+						<fmt:message key="message.activityLocked" />
 					</c:when>
 					<c:otherwise>
 						<fmt:message key="message.warnLockOnFinish" />
@@ -257,22 +235,22 @@
 		</c:if>
 
 		<lams:errors/>
-		
+
 		<p><c:out value="${whiteboard.instructions}" escapeXml="false" /></p>
-		
+
 		<div class="full-screen-content-div">
 			<div class="full-screen-flex-div">
 				<a href="#" class="btn btn-default fixed-button-width pull-right full-screen-launch-button" onclick="javascript:launchIntoFullscreen(this)"
 				   title="<fmt:message key='label.fullscreen.open' />">
 					<i class="fa fa-arrows-alt" aria-hidden="true"></i>
-				</a> 
-		       	<a href="#" class="btn btn-default fixed-button-width pull-right full-screen-exit-button" onclick="javascript:exitFullscreen()"
+				</a>
+				<a href="#" class="btn btn-default fixed-button-width pull-right full-screen-exit-button" onclick="javascript:exitFullscreen()"
 				   title="<fmt:message key='label.fullscreen.close' />">
-		       		<i class="fa fa-compress" aria-hidden="true"></i>
-		       	</a>
-		       	<div class="full-screen-main-div">
+					<i class="fa fa-compress" aria-hidden="true"></i>
+				</a>
+				<div class="full-screen-main-div">
 					<iframe id="whiteboard-frame"
-					        src='${whiteboardServerUrl}/?whiteboardid=${wid}&username=${whiteboardAuthorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}&copyfromwid=${sourceWid}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(whiteboardCopyAccessToken)}'>
+							src='${whiteboardServerUrl}/?whiteboardid=${wid}&username=${whiteboardAuthorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}&copyfromwid=${sourceWid}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(whiteboardCopyAccessToken)}'>
 					</iframe>
 				</div>
 			</div>
@@ -290,23 +268,23 @@
 					</div>
 
 					<c:choose>
-					<c:when test="${empty sessionMap.reflectEntry}">
-						<p>
-							<em> 
-								<fmt:message key="message.no.reflection.available" />
-							</em>
-						</p>
-					</c:when>
-					<c:otherwise>
-						<p>
-							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-						</p>
-					</c:otherwise>
+						<c:when test="${empty sessionMap.reflectEntry}">
+							<p>
+								<em>
+									<fmt:message key="message.no.reflection.available" />
+								</em>
+							</p>
+						</c:when>
+						<c:otherwise>
+							<p>
+								<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
+							</p>
+						</c:otherwise>
 					</c:choose>
 
 					<c:if test="${mode != 'teacher'}">
 						<button name="ContinueButton" onclick="return continueReflect()" class="btn btn-sm btn-default voffset5">
-						<fmt:message key="label.edit" />
+							<fmt:message key="label.edit" />
 						</button>
 					</c:if>
 				</div>
@@ -318,7 +296,7 @@
 			<div>
 				<c:choose>
 					<c:when test="${whiteboard.galleryWalkEnabled}">
-						<button data-toggle="tooltip" 
+						<button data-toggle="tooltip"
 								class="btn btn-default voffset5 pull-right ${mode == 'author' ? '' : 'disabled'}"
 								<c:choose>
 									<c:when test="${mode == 'author'}">
@@ -329,7 +307,7 @@
 										title="<fmt:message key='label.gallery.walk.wait.start' />"
 									</c:otherwise>
 								</c:choose>
-							>
+						>
 							<fmt:message key="label.continue" />
 						</button>
 					</c:when>
@@ -344,16 +322,16 @@
 					</c:when>
 					<c:otherwise>
 						<a href="#nogo" name="FinishButton" id="finish-button"
-								 class="btn btn-primary voffset5 pull-right na">
+						   class="btn btn-primary voffset5 pull-right na">
 							<span class="nextActivity">
 								<c:choose>
-				 					<c:when test="${sessionMap.isLastActivity}">
-				 						<fmt:message key="label.submit" />
-				 					</c:when>
-				 					<c:otherwise>
-				 		 				<fmt:message key="label.finished" />
-				 					</c:otherwise>
-				 				</c:choose>
+									<c:when test="${sessionMap.isLastActivity}">
+										<fmt:message key="label.submit" />
+									</c:when>
+									<c:otherwise>
+										<fmt:message key="label.finished" />
+									</c:otherwise>
+								</c:choose>
 							</span>
 						</a>
 					</c:otherwise>
@@ -362,11 +340,11 @@
 		</c:if>
 
 		<!--closes content-->
-	
+
 		<div id="footer">
 		</div>
 		<!--closes footer-->
 
 	</lams:Page>
-</body>
-</lams:html>
+	</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_wiki/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_wiki/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_tool_wiki/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_zoom/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r186cb47cd7f1937f8671c661ee52676d6c5b8c59 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 186cb47cd7f1937f8671c661ee52676d6c5b8c59)
+++ lams_tool_zoom/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -97,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -109,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -193,80 +175,6 @@
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -323,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_tool_zoom/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -r186cb47cd7f1937f8671c661ee52676d6c5b8c59 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_tool_zoom/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 186cb47cd7f1937f8671c661ee52676d6c5b8c59)
+++ lams_tool_zoom/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -18,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -99,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -111,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -124,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -196,80 +178,6 @@
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -325,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -33,6 +33,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -90,7 +91,7 @@
     	}
     }
     function doCancel() {
-    	if(confirm("<fmt:message key='${cancelConfirmMsgKey}'/>")){
+    	if(confirm("<spring:escapeBody javaScriptEscape='true'><fmt:message key='${cancelConfirmMsgKey}'/></spring:escapeBody>")){
     		closeWindow("cancel");
     	}
     }
Index: lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rfa2b057ec9dda91bbe9fa54337c32c443f561cd1 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision fa2b057ec9dda91bbe9fa54337c32c443f561cd1)
+++ lams_www/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -148,8 +149,8 @@
 <script type="text/javascript">
 	var minimumWordsSpinnerArray  = new Array();
 	var maxOrderId;
-	var criteriaArrows = '<div class="arrow-up" title="<fmt:message key="${upLabel}"/>" />' + 
-	 					 '<div class="arrow-down" title="<fmt:message key="${downLabel}"/>" />';
+	var criteriaArrows = '<div class="arrow-up" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+	 					 '<div class="arrow-down" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />';
 	  
 	var newGroupId = -1; // groups existing in DB have ID > 0; new, unsaved ones have ID < 0
 	const MAX_RUBRICS_COLUMNS = 5;
@@ -255,7 +256,7 @@
 		if ( validate ) {
 			str += ' onchange="validateRatingLimits('+validate+','+orderId+');" '
 		} 
-		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><fmt:message key="${allLabel}"/></option>';
+		str	+= '> <option value="-1" '+ ( -1 == currentValue ? ' selected="selected"' : '' ) + '><spring:escapeBody javaScriptEscape="true"><fmt:message key="${allLabel}"/></spring:escapeBody></option>';
 		if ( zeroDescription ) {
 			str += '<option value="0" '+ ( 0 == currentValue ? ' selected="selected"' : '' ) + '>'+zeroDescription+'</option>';
 		}
@@ -320,52 +321,52 @@
 		if ( style == 0 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateManadatorySpinner(orderId, '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateManadatorySpinner(orderId, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleComment}" />:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleComment}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, true);
 			
 		} else if ( style == 1 ) {
 			var ratingLimitsStr = '';
 			if ( '${hasRatingLimits}' == 'true' ) {
-				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><fmt:message key="${minimumLabel}" /></label>&nbsp;'
-				+ generateSelect('minimumRates' + orderId, 'true', '<fmt:message key="${noMinimumLabel}"/>', orderId, minimumRates)
-	  			+ '<label for="maximumRates" class="loffset10"><fmt:message key="${maximumLabel}" /></label>&nbsp;'
-				+ generateSelect('maximumRates' + orderId, 'false', '<fmt:message key="${noMaximumLabel}"/>', orderId, maximumRates)
+				ratingLimitsStr = '<div class="voffset5"><label for="minimumRates"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${minimumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('minimumRates' + orderId, 'true', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMinimumLabel}"/></spring:escapeBody>', orderId, minimumRates)
+	  			+ '<label for="maximumRates" class="loffset10"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${maximumLabel}" /></spring:escapeBody></label>&nbsp;'
+				+ generateSelect('maximumRates' + orderId, 'false', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${noMaximumLabel}"/></spring:escapeBody>', orderId, maximumRates)
 				+ '<BR/>'
-			 	+ generateSpinner(orderId, justifyOrComment, '<fmt:message key="${allowCommentsLabel}" />', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit);
+			 	+ generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${allowCommentsLabel}" /></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit);
 			}
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleStar}" />:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleStar}" /></spring:escapeBody>:&nbsp;</div>'+inputField + hiddenInputs + ratingLimitsStr
 			})).appendTo('#criterias-table-body');
 				
 			activateSpinner(orderId, justifyOrComment);
 			
 		} else if ( style == 2 ) { 
-			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><fmt:message key="${rankLabel}"/></label>&nbsp;'
+			var rankingStr = '<div class="voffset5"><label for="maxRating' + orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${rankLabel}"/></spring:escapeBody></label>&nbsp;'
 			  + generateSelect('maxRating' + orderId, null, null, orderId, maxRating);
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleRanking}" />:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleRanking}" /></spring:escapeBody>:&nbsp;</div>'+ inputField + hiddenInputs + rankingStr 
 			})).appendTo('#criterias-table-body');
 	
 		} else if ( style == 3) {
 			row.append(jQuery('<td/>', {
 				'class': 'criteria-info',
-			    html: '<div class="voffset5"><fmt:message key="${styleHedging}" />:&nbsp;</div>' + inputField + hiddenInputs
-				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><fmt:message key="${hedgeRankLabel}"/>&nbsp;</label>'
+			    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${styleHedging}" /></spring:escapeBody>:&nbsp;</div>' + inputField + hiddenInputs
+				 + '<div class="voffset5"><label for="maxRating'+ orderId + '"><spring:escapeBody javaScriptEscape="true"><fmt:message key="${hedgeRankLabel}"/></spring:escapeBody>&nbsp;</label>'
 			     + '<input type="text" name="maxRating' + orderId + '" id="maxRating' + orderId + '" value="'+maxRating+'" size="4">&nbsp;'
-				 + generateSpinner(orderId, justifyOrComment, '<fmt:message key="${justifyLabel}"/>', '<fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message>', commentMinWordsLimit)
+				 + generateSpinner(orderId, justifyOrComment, '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${justifyLabel}"/></spring:escapeBody>', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${minNumberWordsLabel}"><fmt:param> </fmt:param></fmt:message></spring:escapeBody>', commentMinWordsLimit)
 			})).appendTo('#criterias-table-body');	
 			
 			activateSpinner(orderId, justifyOrComment);
@@ -417,7 +418,7 @@
 		// it deletes either whole criterion or a rubrics row (which is also a criterion)
 		row.append($('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times delete-criteria" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times delete-criteria" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		}));
 	}
 
@@ -433,7 +434,7 @@
 		var cell = $('<td />', {
 			'class': 'criteria-info',
 			// arrows to move whole rubrics table
-		    html: '<div class="voffset5"><fmt:message key="label.rating.style.rubrics" />:<div class="pull-right">' + criteriaArrows + '</div></div>'
+		    html: '<div class="voffset5"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.style.rubrics" /></spring:escapeBody>:<div class="pull-right">' + criteriaArrows + '</div></div>'
 		}).attr('colspan', '3').appendTo(row);
 
 		var rubricsTable = $("<table />").addClass('table-striped table-condensed rubrics-table').attr('groupId', groupId).appendTo(cell)
@@ -443,7 +444,7 @@
 				$(this).closest('tr').find('textarea').height(height);
 			}),
 			addColumnButton = $('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 rubrics-add-column-button')
-										   	 .text('<fmt:message key="label.rating.rubrics.column.add" />').click(function(){
+										   	 .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.add" /></spring:escapeBody>').click(function(){
 						var columns = $('.rubrics-columns-part .rubrics-column', rubricsTable);
 						// no more than X columns allowed
 						if (columns.length >= MAX_RUBRICS_COLUMNS) {
@@ -457,7 +458,7 @@
 
 						// add delete button
 						$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-								  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+								  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 							deleteRubricsColumn($(this));
 						});
 
@@ -489,7 +490,7 @@
 		}
 		
 		$('<button />').attr('type', 'button').addClass('btn btn-default pull-right voffset20 roffset10')
-					   .text('<fmt:message key="label.rating.rubrics.row.add" />').click(function(){
+					   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.add" /></spring:escapeBody>').click(function(){
 			// this will add a row to the existing rubrics table with the given group ID
 			maxOrderId++;
 			$("#criteria-max-order-id").val(maxOrderId);
@@ -503,7 +504,7 @@
 		row.append('<th />');
 
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.headers" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.headers" /></spring:escapeBody>')
 				   .appendTo(row);
 		// empty cell for action buttons
 		$('<th />').attr('colspan', 2).appendTo(row);
@@ -516,7 +517,7 @@
 		for (var i = 0; i < rubricsColumnsLength; i++) {
 			cell = $('<td />').appendTo(row);
 			$('<i />').addClass('fa fa-times rubrics-delete-column-button')
-					  .attr('title', '<fmt:message key="${deleteLabel}"/>').appendTo(cell).click(function(){
+					  .attr('title', '<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>').appendTo(cell).click(function(){
 				deleteRubricsColumn($(this));
 			});
 			
@@ -528,9 +529,9 @@
 
 		// description of the rows part
 		row = $('<tr />').addClass('rubrics-rows-part').appendTo(rubricsTable);
-		$('<th />').addClass('rubrics-row-title').text('<fmt:message key="label.rating.rubrics.row.headers" />').appendTo(row);
+		$('<th />').addClass('rubrics-row-title').text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.row.headers" /></spring:escapeBody>').appendTo(row);
 		$('<th />').attr('colspan', rubricsColumnsLength)
-				   .text('<fmt:message key="label.rating.rubrics.column.content" />')
+				   .text('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.rating.rubrics.column.content" /></spring:escapeBody>')
 				   .appendTo(row);
 		$('<td />').attr('colspan', 2).appendTo(row);
 
@@ -624,7 +625,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r500f37cffc230632ac8b906e91bcddd44836a814 -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 500f37cffc230632ac8b906e91bcddd44836a814)
+++ lams_www/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -9,6 +9,7 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -132,12 +133,12 @@
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${upLabel}"/></spring:escapeBody>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${downLabel}"/></spring:escapeBody>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
+			html: '<i class="fa fa-times" title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="${deleteLabel}"/></spring:escapeBody>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -257,7 +258,7 @@
 				maxRateDropDown.selectedIndex = minRateDropDown.selectedIndex;
 			}
 
-			alert('<fmt:message key="js.warning.max.min.limit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="js.warning.max.min.limit"/></spring:escapeBody>');
 		}
 	}
 </script>
Index: lams_www/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -r006c6b1060de8f84a95f80940553251f22e7a60a -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 006c6b1060de8f84a95f80940553251f22e7a60a)
+++ lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -11,6 +11,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <%@ taglib uri="csrfguard" prefix="csrf" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
@@ -53,10 +54,10 @@
 		outcomeMappingIds${outcomeTagId} = [],
 		outcomeAddEnabled = true,
 		
-		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
-		outcomeCreateNewLabel = '<fmt:message key="outcome.authoring.create.new" />',
+		outcomeExistingNoneLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.existing.none" /></spring:escapeBody>',
+		outcomeCreateNewLabel = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.create.new" /></spring:escapeBody>',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>',
-		outcomeMappingRemoveConfirm = '<fmt:message key="outcome.authoring.remove.confirm" />';
+		outcomeMappingRemoveConfirm = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="outcome.authoring.remove.confirm" /></spring:escapeBody>';
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -2,6 +2,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -96,7 +97,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -108,11 +110,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -122,20 +119,6 @@
 					}
 				};
 				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -186,86 +169,12 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
-
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
 			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
@@ -322,7 +231,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}
Index: lams_www/web/WEB-INF/tags/Page5.tag
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7
--- lams_www/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_www/web/WEB-INF/tags/Page5.tag	(.../Page5.tag)	(revision 9496ff3ffe5e98272f7939a2cf4e8c6dbb2901f7)
@@ -3,6 +3,7 @@
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
 <%@ attribute name="formID" required="false" rtexprvalue="true"%>
@@ -17,7 +18,7 @@
 <%@ tag  import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ tag  import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
-<c:if test="${empty usePanel}">				
+<c:if test="${empty usePanel}">
 	<c:set var="usePanel">true</c:set>
 </c:if>
 <c:set var="displayPortrait"><%=Configuration.get(ConfigurationKeys.DISPLAY_PORTRAIT)%></c:set>
@@ -98,7 +99,8 @@
 				</c:if>
 			</c:if>
 		</c:if>
-		
+
+		<lams:JSImport src="includes/javascript/websocket.js" />
 		<script type="text/javascript">
 			var allowRestart = false,
 				restartLessonConfirmation = "Are you sure you want to start the lesson from the beginning?",
@@ -110,11 +112,6 @@
 				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
-				commandWebsocketInitTime = null,
-				commandWebsocket = null,
-				commandWebsocketPingTimeout = null,
-				commandWebsocketPingFunc = null,
-				commandWebsocketReconnectAttempts = 0,
 				commandWebsocketHookTrigger = null,
 				commandWebsocketHook = null,
 				
@@ -123,21 +120,7 @@
 						'containerId' : 'progressBarDiv'
 					}
 				};
-				
-			commandWebsocketPingFunc = function(skipPing){
-				if (commandWebsocket.readyState == commandWebsocket.CLOSING 
-						|| commandWebsocket.readyState == commandWebsocket.CLOSED){
-					return;
-				}
-				
-				// check and ping every 3 minutes
-				commandWebsocketPingTimeout = setTimeout(commandWebsocketPingFunc, 3*60*1000);
-				// initial set up does not send ping
-				if (!skipPing) {
-					commandWebsocket.send("ping");
-				}
-			};
-				
+
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
 					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
@@ -188,87 +171,13 @@
 				// check if autosave does not happen too often
 				if (autosaveInterval > 0 && lamsAutosaveTimestamp && lamsAutosaveTimestamp + autosaveInterval/2 > currentTime) {
 					// this label is required only in tool which implement autosave
-					alert('<fmt:message key="label.prevent.learner.autosave.mutliple.tabs" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.prevent.learner.autosave.mutliple.tabs" /></spring:escapeBody>');
 					return false;
 				}
 				localStorage.setItem('lamsAutosaveTimestamp', currentTime);
 				return true;
 			}
 
-			function initCommandWebsocket(){
-				commandWebsocketInitTime = Date.now();
-				// it is not an obvious place to init the websocket, but we need lesson ID
-				commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws')
-						+ 'commandWebsocket?lessonID=' + lessonId);
-
-				commandWebsocket.onclose = function(e){
-					// check reason and whether the close did not happen immediately after websocket creation
-					// (possible access denied, user logged out?)
-					if (e.code === 1006 &&
-						Date.now() - commandWebsocketInitTime > 1000 &&
-						commandWebsocketReconnectAttempts < 20) {
-						commandWebsocketReconnectAttempts++;
-						// maybe iPad went into sleep mode?
-						// we need this websocket working, so init it again after delay
-						setTimeout(initCommandWebsocket, 3000);
-					}
-				};
-
-				// set up timer for the first time
-				commandWebsocketPingFunc(true);
-				
-				// when the server pushes new commands
-				commandWebsocket.onmessage = function(e){
-					// read JSON object
-					var command = JSON.parse(e.data);
-					if (command.message) {
-						// some tools implement autosave feature
-						// if it is such a tool, trigger it
-						if (command.message === 'autosave') {
-							// the name of this function is same in all tools
-							if (typeof learnerAutosave == 'function') {
-								learnerAutosave(true);
-							}
-						} else {
-							alert(command.message);
-						}
-					}
-					
-					// if learner's currently displayed page has hookTrigger same as in the JSON
-					// then a function also defined on that page will run
-					if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger 
-										    && typeof commandWebsocketHook === 'function') {
-					    commandWebsocketHook(command.hookParams);
-					}
-
-					if (command.redirectURL) {
-						window.location.href = command.redirectURL;
-					}
-
-					if (command.discussion) {
-						var discussionCommand = $('#discussion-sentiment-command');
-						if (discussionCommand.length === 0) {
-							discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
-						}
-						discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
-							lessonId : lessonId
-						});
-					}
-
-					// reset ping timer
-					clearTimeout(commandWebsocketPingTimeout);
-					commandWebsocketPingFunc(true);
-				};
-
-				// check if there is a running discussion; if so, a websocket command will come to display the widget
-				$.ajax({
-					url : LEARNING_URL + "discussionSentiment/checkLearner.do",
-					data: {
-						lessonId : lessonId
-					}
-				});
-			}
-			
 			$(document).ready(function() {
 				var showControlBar = 1; // 0/1/2 none/full/keep space
 				var showIM = true;
@@ -324,7 +233,51 @@
 								});
 							}
 
-							initCommandWebsocket();
+							let commandWebsocket = initWebsocket('commandWebsocket', LEARNING_URL.replace('http', 'ws')
+									+ 'commandWebsocket?lessonID=' + lessonId);
+
+							if (commandWebsocket) {
+								// when the server pushes new inputs
+								commandWebsocket.onmessage = function (e) {
+								// read JSON object
+									var command = JSON.parse(e.data);
+									if (command.message) {
+										// some tools implement autosave feature
+										// if it is such a tool, trigger it
+										if (command.message === 'autosave') {
+											// the name of this function is same in all tools
+											if (typeof learnerAutosave == 'function') {
+												learnerAutosave(true);
+											}
+										} else {
+											alert(command.message);
+										}
+									}
+
+									// if learner's currently displayed page has hookTrigger same as in the JSON
+									// then a function also defined on that page will run
+									if (command.hookTrigger && command.hookTrigger == commandWebsocketHookTrigger
+											&& typeof commandWebsocketHook === 'function') {
+										commandWebsocketHook(command.hookParams);
+									}
+
+									if (command.redirectURL) {
+										window.location.href = command.redirectURL;
+									}
+
+									if (command.discussion) {
+										var discussionCommand = $('#discussion-sentiment-command');
+										if (discussionCommand.length === 0) {
+											discussionCommand = $('<div />').attr('id', 'discussion-sentiment-command').appendTo('body');
+										}
+										discussionCommand.load(LEARNING_URL + "discussionSentiment/" + command.discussion + ".do", {
+											lessonId : lessonId
+										});
+									}
+									// reset ping timer
+									websocketPing('commandWebsocket', true);
+								};
+							}
 						}
 					});
 				}