Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.13 -r1.1.2.14
--- lams_admin/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:45 -0000	1.1.2.13
+++ lams_admin/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:30 -0000	1.1.2.14
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.18 -r1.1.2.19
--- lams_central/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:59:00 -0000	1.1.2.18
+++ lams_central/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:51 -0000	1.1.2.19
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_gradebook/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:35 -0000	1.1.2.3
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:47 -0000	1.1.2.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.14 -r1.1.2.15
--- lams_learning/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:41 -0000	1.1.2.14
+++ lams_learning/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:34 -0000	1.1.2.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.13 -r1.1.2.14
--- lams_monitoring/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:54 -0000	1.1.2.13
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:50 -0000	1.1.2.14
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:56 -0000	1.1.2.15
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:45 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:36 -0000	1.1.2.16
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:52 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:37 -0000	1.1.2.16
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:43 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:37 -0000	1.1.2.15
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:33 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.17 -r1.1.2.18
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:58 -0000	1.1.2.17
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:42 -0000	1.1.2.18
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:52 -0000	1.1.2.16
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:29 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_images/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:39 -0000	1.1.2.15
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:55 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:55 -0000	1.1.2.15
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:46 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:48 -0000	1.1.2.15
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:31 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:52 -0000	1.1.2.16
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:48 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.17 -r1.1.2.18
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:47 -0000	1.1.2.17
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:33 -0000	1.1.2.18
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:42 -0000	1.1.2.15
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:45 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:53 -0000	1.1.2.15
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:32 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:51 -0000	1.1.2.15
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:37 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:49 -0000	1.1.2.16
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:44 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.18 -r1.1.2.19
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:56 -0000	1.1.2.18
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:27 -0000	1.1.2.19
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:43 -0000	1.1.2.15
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:53 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:38 -0000	1.1.2.15
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:39 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:50 -0000	1.1.2.16
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:49 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:59 -0000	1.1.2.15
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:35 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:44 -0000	1.1.2.16
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:54 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:40 -0000	1.1.2.16
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:38 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:57 -0000	1.1.2.16
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:36 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.16 -r1.1.2.17
--- lams_tool_task/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:44 -0000	1.1.2.16
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:39 -0000	1.1.2.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:48 -0000	1.1.2.15
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:41 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:46 -0000	1.1.2.15
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:40 -0000	1.1.2.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_www/web/WEB-INF/tags/Page.tag	3 Dec 2016 00:58:40 -0000	1.1.2.4
+++ lams_www/web/WEB-INF/tags/Page.tag	7 Dec 2016 16:27:28 -0000	1.1.2.5
@@ -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