Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
===================================================================
diff -u -r770fb82629331ca1c70c47845ab63b9528b7bc9e -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision 770fb82629331ca1c70c47845ab63b9528b7bc9e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java	(.../QaLearningController.java)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -75,11 +75,13 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.WebApplicationContext;
 
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -569,7 +571,8 @@
 	return forwardName;
     }
 
-    @RequestMapping("/checkLeaderProgress")
+    @RequestMapping(value="/checkLeaderProgress", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @ResponseBody
     public String checkLeaderProgress(HttpServletRequest request, HttpServletResponse response) throws IOException {
 
 	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
@@ -581,9 +584,7 @@
 
 	ObjectNode ObjectNode = JsonNodeFactory.instance.objectNode();
 	ObjectNode.put("isLeaderResponseFinalized", isLeaderResponseFinalized);
-	response.setContentType("application/x-json;charset=utf-8");
-	response.getWriter().print(ObjectNode);
-	return null;
+	return ObjectNode.toString();
     }
 
     /**
@@ -598,14 +599,14 @@
      * @throws ServletException
      */
     @RequestMapping("/autoSaveAnswers")
-    public String autoSaveAnswers(@ModelAttribute("qaLearningForm") QaLearningForm qaLearningForm,
+    @ResponseBody
+    public void autoSaveAnswers(@ModelAttribute("qaLearningForm") QaLearningForm qaLearningForm,
 	    HttpServletRequest request) throws IOException, ServletException {
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
 	//prohibit users from autosaving answers after response is finalized but Resubmit button is not pressed (e.g. using 2 browsers)
 	if (qaQueUsr.isResponseFinalized()) {
-	    return null;
 	}
 
 	LearningUtil.saveFormRequestData(request, qaLearningForm);
@@ -632,7 +633,6 @@
 		qaService.updateResponseWithNewAnswer(newAnswer, toolSessionID, new Long(currentQuestionIndex), true);
 	    }
 	}
-	return null;
     }
 
     /**
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
===================================================================
diff -u -r7ccd2797793d9c746fe08ab675942b820bf47742 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 7ccd2797793d9c746fe08ab675942b820bf47742)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -191,6 +191,7 @@
 	SortedSet<ScratchieItem> itemList = getItemList(sessionMap);
 	itemList.clear();
 	itemList.addAll(items);
+	request.setAttribute(ScratchieConstants.ATTR_ITEM_LIST, itemList);
 
 	// If there is no order id, set it up
 	int i = 1;
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java	(.../ScratchieForm.java)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java	(.../ScratchieForm.java)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -23,8 +23,11 @@
 
 package org.lamsfoundation.lams.tool.scratchie.web.form;
 
+import java.util.SortedSet;
+
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
 
 /**
  * Scratchie Form.
@@ -38,7 +41,19 @@
 
     private String sessionMapID;
     private String contentFolderID;
+    private SortedSet<ScratchieItem> itemList;
 
+    public SortedSet<ScratchieItem> getItemList() {
+        return itemList;
+    }
+
+    public void setItemList(SortedSet<ScratchieItem> itemList) {
+        this.itemList = itemList;
+    }
+
+    //tool access mode;
+    private String mode;
+    
     // Forum fields
     private int currentTab;
 
@@ -86,4 +101,14 @@
 	return scratchie;
     }
 
+    public String getMode() {
+        return mode;
+    }
+
+    public void setMode(String mode) {
+        this.mode = mode;
+    }
+    
+    
+
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java	(.../ScratchieItemForm.java)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java	(.../ScratchieItemForm.java)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -22,6 +22,10 @@
 
 package org.lamsfoundation.lams.tool.scratchie.web.form;
 
+import java.util.List;
+
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswer;
+
 /**
  *
  * Scratchie Item Form.
@@ -34,6 +38,7 @@
     private String itemIndex;
     private String sessionMapID;
     private String contentFolderID;
+    private List<ScratchieAnswer> answerList;
 
     // tool access mode;
     private String mode;
@@ -89,4 +94,13 @@
 	this.description = description;
     }
 
+    public List<ScratchieAnswer> getAnswerList() {
+        return answerList;
+    }
+
+    public void setAnswerList(List<ScratchieAnswer> answerList) {
+        this.answerList = answerList;
+    }
+
+    
 }
Index: lams_tool_scratchie/web/pages/admin/config.jsp
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/admin/config.jsp	(.../config.jsp)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/web/pages/admin/config.jsp	(.../config.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -23,7 +23,7 @@
 				</lams:Alert>
 			</c:if>
 			
-			<form:form action="admin/saveContent.do" modelAttribute="scratchieAdminForm" id="scratchieAdminForm" method="post" enctype="multipart/form-data">
+			<form:form action="/lams/tool/lascrt11/admin/saveContent.do" modelAttribute="scratchieAdminForm" id="scratchieAdminForm" method="post" enctype="multipart/form-data">
 				<div class="checkbox">
 					<label for="enabledExtraPointOption">
 					<form:checkbox path="enabledExtraPointOption"/>
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+<c:set var="sessionMapID" value="${authoringForm.sessionMapID}" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="confidenceLevelsActivities" value="${sessionMap.confidenceLevelsActivities}" />
 
@@ -9,7 +8,7 @@
 		$("#display-confidence-levels-activities").click(function() {
 			$("#confidence-levels-activity").prop("disabled", !$(this).is(':checked'));
 		});
-		<c:if test="${formBean.scratchie.confidenceLevelsActivityUiid == null}">$("#confidence-levels-activity").prop('disabled','disabled'); </c:if>
+		<c:if test="${authoringForm.scratchie.confidenceLevelsActivityUiid == null}">$("#confidence-levels-activity").prop('disabled','disabled'); </c:if>
 		
 		
 		$("#overwrite-preset-marks").click(function() {
@@ -47,7 +46,7 @@
 	
 	<div class="checkbox">
 		<label for="show-scratchies-in-results">
-			<form:checkbox property="scratchie.showScrachiesInResults" styleId="show-scratchies-in-results"/>
+			<form:checkbox path="scratchie.showScrachiesInResults" styleId="show-scratchies-in-results"/>
 			<fmt:message key="label.authoring.advanced.show.scratchies.in.results" />
 		</label>
 	</div>
@@ -81,7 +80,7 @@
 			<c:otherwise>
 				<label for="display-confidence-levels-activities">
 					<input type="checkbox" id="display-confidence-levels-activities"
-							<c:if test="${formBean.scratchie.confidenceLevelsActivityUiid != null}">checked="true"</c:if>
+							<c:if test="${authoringForm.scratchie.confidenceLevelsActivityUiid != null}">checked="true"</c:if>
 					/>
 				
 					<fmt:message key="label.show.confidence.level" />&nbsp;
@@ -159,6 +158,6 @@
 		}
 	});
 	
-	<c:if test="${formBean.scratchie.burningQuestionsEnabled}">$("#shuffle-items").prop("disabled", true);</c:if>
+	<c:if test="${authoringForm.scratchie.burningQuestionsEnabled}">$("#shuffle-items").prop("disabled", true);</c:if>
 	
 </script>
Index: lams_tool_scratchie/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7ccd2797793d9c746fe08ab675942b820bf47742 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7ccd2797793d9c746fe08ab675942b820bf47742)
+++ lams_tool_scratchie/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -40,7 +40,7 @@
 </lams:head>
 <body class="stripes" onLoad="init()">
 			
-	<form:form action="authoring/update.do" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data" >
+	<form:form action="/lams/tool/lascrt11/authoring/update.do" modelAttribute="authoringForm" method="post" id="authoringForm" enctype="multipart/form-data" >
 		<form:hidden path="scratchie.contentId" />
 		<form:hidden path="mode"/>
 		<form:hidden path="sessionMapID" />
@@ -78,8 +78,8 @@
 					accessMode="author"
 				--%>
 				<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=ScratchieConstants.TOOL_SIGNATURE%>" 
-					toolContentID="${formBean.scratchie.contentId}" accessMode="${mode}" defineLater="${mode=='teacher'}"
-					customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}" />
+					toolContentID="${authoringForm.scratchie.contentId}" accessMode="${mode}" defineLater="${mode=='teacher'}"
+					customiseSessionID="${authoringForm.sessionMapID}" contentFolderID="${authoringForm.contentFolderID}" />
 			</lams:TabBodyArea>
 
 			<div id="footer"></div>
Index: lams_tool_scratchie/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+<c:set var="sessionMapID" value="${authoringForm.sessionMapID}" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:if test="${itemList == null}">
 	<c:set var="itemList" value="${sessionMap.itemList}"/>
@@ -98,11 +97,11 @@
 </div>
 <div class="form-group">
     <label for="scratchie.instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
-    <lams:CKEditor id="scratchie.instructions" value="${formBean.scratchie.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
+    <lams:CKEditor id="scratchie.instructions" value="${authoringForm.scratchie.instructions}" contentFolderID="${authoringForm.contentFolderID}"></lams:CKEditor>
 </div>
 
 <%-- <div id="resourceListArea">
-	<c:set var="sessionMapID" value="${formBean.sessionMapID}" />
+	<c:set var="sessionMapID" value="${authoringForm.sessionMapID}" />
  	<%@ include file="/pages/authoring/parts/itemlist.jsp"%>
 </div>
  --%>
Index: lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
===================================================================
diff -u -r22cca1a815f7aee530e14ab87b7744f381d03ac1 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision 22cca1a815f7aee530e14ab87b7744f381d03ac1)
+++ lams_tool_scratchie/web/pages/authoring/parts/additem.jsp	(.../additem.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -220,7 +220,7 @@
 	
 			<%@ include file="/common/messages.jsp"%>
 			
-			<form:form action="authoring/saveItem.do" method="post" modelAttribute="scratchieItemForm" id="scratchieItemForm">
+			<form:form action="/lams/tool/lascrt11/authoring/saveItem.do" method="post" modelAttribute="scratchieItemForm" id="scratchieItemForm">
 				<form:hidden path="sessionMapID" />
 				<form:hidden path="answerList" id="answerList" />
 				<form:hidden path="itemIndex" />
@@ -233,7 +233,7 @@
 
 				<div class="form-group">
 					<label for="description"><fmt:message key="label.authoring.basic.question.text" /></label>
-					<lams:CKEditor id="description" value="${formBean.description}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
+					<lams:CKEditor id="description" value="${authoringForm.description}" contentFolderID="${authoringForm.contentFolderID}"></lams:CKEditor>
 				</div>
 
 				<label for="hasAnswerFilled" class="error" style="display: none;"></label>
Index: lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -45,16 +45,16 @@
 </lams:head>
 <body id="body">
 	<%@ include file="/common/messages.jsp"%>
-	<form:form enctype="multipart/form-data" modelAttribute="pedagogicalPlannerForm" action="authoring/saveOrUpdatePedagogicalPlannerForm.do" id="pedagogicalPlannerForm" method="post">
+	<form:form enctype="multipart/form-data" modelAttribute="pedagogicalPlannerForm" action="/lams/tool/lascrt11/authoring/saveOrUpdatePedagogicalPlannerForm.do" id="pedagogicalPlannerForm" method="post">
 		<form:hidden path="toolContentID" id="toolContentID" />
 		<form:hidden path="valid" id="valid" />
 		<form:hidden path="callID" id="callID" />
 		<form:hidden path="activityOrderNumber" id="activityOrderNumber" />
 		
 		<h4 class="space-left"><fmt:message key="label.authoring.basic.resource.instructions"/></h4>
 		<lams:CKEditor id="instructions"
-			value="${formBean.instructions}"
-			contentFolderID="${formBean.contentFolderID}"
+			value="${pedagogicalPlannerForm.instructions}"
+			contentFolderID="${pedagogicalPlannerForm.contentFolderID}"
                toolbarSet="CustomPedplanner" height="150px"
                width="${param.plannerCKEditorLongWidth}" displayExpanded="false">
 		</lams:CKEditor>
Index: lams_tool_scratchie/web/pages/authoring/start.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/authoring/start.jsp	(.../start.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -4,7 +4,7 @@
 <html>
 	<body class="stripes">
 	
-		<form:form action="init.do?mode=${mode}" method="post" modelAttribute="authoringForm" id="startForm">
+		<form:form action="/lams/tool/lascrt11/authoring/init.do?mode=${mode}" method="post" modelAttribute="authoringForm" id="startForm">
 			<form:hidden path="scratchie.contentId"/>
 			<form:hidden path="sessionMapID"/>
 		</form:form>
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -222,7 +222,7 @@
 				document.getElementById("finishButton").disabled = true;
 
 		        	var myForm = $('#burning-questions');
-		        	myForm.attr("action", '<c:url value="/learning/' + method + '.do?sessionMapID=${sessionMapID}"/>&date=' + new Date().getTime());
+		        	myForm.attr("action", '<c:url value="/learning.do?sessionMapID=${sessionMapID}"/>&date=' + new Date().getTime());
 		        	myForm.submit();
 			}
 			
Index: lams_tool_scratchie/web/pages/learning/notebook.jsp
===================================================================
diff -u -r7d11dff5efc5ae24542a53dd8f753bfab66be71d -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 7d11dff5efc5ae24542a53dd8f753bfab66be71d)
+++ lams_tool_scratchie/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -22,7 +22,7 @@
 	<c:set var="sessionMapID" value="${param.sessionMapID}" />
 	<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 
-	<form:form action="learning/submitReflection.do" modelAttribute="reflectionForm" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
+	<form:form action="/lams/tool/lascrt11/learning/submitReflection.do" modelAttribute="reflectionForm" method="post" onsubmit="disableFinishButton();" id="reflectionForm">
 		<form:hidden path="userID" />
 		<form:hidden path="sessionMapID" />
 
Index: lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r60b108064c4a844e3f153a849ab51a14bc3a8488
--- lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(.../traStudentChoices.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(.../traStudentChoices.jsp)	(revision 60b108064c4a844e3f153a849ab51a14bc3a8488)
@@ -2,7 +2,7 @@
 
 <script>
 	function exportExcel(){
-		location.href = "<lams:LAMSURL/>tool/lascrt11/tblmonitoring.do?method=exportExcel&toolContentID=${toolContentID}&reqID=" + (new Date()).getTime();
+		location.href = "<lams:LAMSURL/>tool/lascrt11/tblmonitoring/exportExcel.do?toolContentID=${toolContentID}&reqID=" + (new Date()).getTime();
 	};
 </script>