Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rf2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94 -rd539f1141e9a1ef85e25948a47a7e70f46646fbd
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision f2c6fdd167bba44e7c7b4fa9c837a3d7d9e05f94)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision d539f1141e9a1ef85e25948a47a7e70f46646fbd)
@@ -92,7 +92,7 @@
 				mode = '${mode}',
 				
 				LAMS_URL = '<lams:LAMSURL/>',
-				APP_URL = LAMS_URL + 'learning/',
+				LEARNING_URL = LAMS_URL + 'learning/',
 
 				// it gets initialised along with progress bar
 				commandWebsocket = null,
@@ -105,12 +105,12 @@
 
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = APP_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
 			function viewNotebookEntries(){
-				openPopUp(APP_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+				openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
 						"Notebook",
 						648,1152,
 						"no");
@@ -167,7 +167,7 @@
 
 				if ( lessonId != "" || toolSessionId != "" ) {
 					$.ajax({
-						url : APP_URL + 'learner.do',
+						url : LEARNING_URL + 'learner.do',
 						data : {
 							'method'   : 'getLessonDetails',
 							'lessonID' : lessonId,
@@ -191,7 +191,7 @@
 							var presenceEnabledPatch = result.presenceEnabledPatch;
 							var presenceImEnabled = result.presenceImEnabled;
 							if ( showIM && (presenceEnabledPatch || presenceImEnabled) ) {
-								presenceURL = APP_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
+								presenceURL = LEARNING_URL+"presenceChat.jsp?presenceEnabledPatch="+presenceEnabledPatch
 										+"&presenceImEnabled="+presenceImEnabled+"&lessonID="+lessonId;
 								<c:if test="${not usePanel}">
 								presenceURL = presenceURL + "&reloadBootstrap=true";
@@ -204,7 +204,7 @@
 							}
 
 							// it is not an obvious place to init the websocket, but we need lesson ID
-							commandWebsocket = new WebSocket(APP_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
+							commandWebsocket = new WebSocket(LEARNING_URL.replace('http', 'ws') + 'commandWebsocket?lessonID=' + lessonId);
 							// when the server pushes new commands
 							commandWebsocket.onmessage = function(e){
 								// read JSON object