Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
===================================================================
diff -u -r5f5d164117e56516c294f276bbaa4a33e2108372 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java	(.../QaAuthoringConditionController.java)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -34,7 +34,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.struts.action.ActionForm;
-import org.apache.struts.util.LabelValueBean;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
 import org.lamsfoundation.lams.tool.qa.QaCondition;
@@ -79,7 +78,7 @@
      * @return
      */
     @RequestMapping("/newConditionInit")
-    private String newConditionInit(@ModelAttribute QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private String newConditionInit(@ModelAttribute("QaConditionForm") QaConditionForm QaConditionForm, HttpServletRequest request) {
 
 	populateFormWithPossibleItems(QaConditionForm, request);
 	QaConditionForm.setOrderId(-1);
@@ -94,7 +93,7 @@
      * @return
      */
     @RequestMapping("/editCondition")
-    private String editCondition(QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private String editCondition(@ModelAttribute("QaConditionForm")QaConditionForm QaConditionForm, HttpServletRequest request) {
 
 	String sessionMapID = QaConditionForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
@@ -127,7 +126,7 @@
      * @throws ServletException
      */
     @RequestMapping(value = "/saveOrUpdateCondition", method = RequestMethod.POST)
-    private String saveOrUpdateCondition(QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private String saveOrUpdateCondition(@ModelAttribute("QaConditionForm")QaConditionForm QaConditionForm, HttpServletRequest request) {
 
 	MultiValueMap<String, String> errorMap = validateQaCondition(QaConditionForm, request);
 
@@ -327,7 +326,7 @@
      * @param form
      * @param request
      */
-    private void populateFormWithPossibleItems(QaConditionForm QaConditionForm, HttpServletRequest request) {
+    private void populateFormWithPossibleItems(@ModelAttribute("QaConditionForm")QaConditionForm QaConditionForm, HttpServletRequest request) {
 	// get back sessionMAP
 	String sessionMapID = QaConditionForm.getSessionMapID();
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java
===================================================================
diff -u -r5f5d164117e56516c294f276bbaa4a33e2108372 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaController.java	(.../QaController.java)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -36,16 +36,10 @@
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.Globals;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.learningdesign.TextSearchConditionComparator;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
@@ -57,7 +51,6 @@
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
-import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
 import org.lamsfoundation.lams.tool.qa.util.AuthoringUtil;
 import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.util.QaQueContentComparator;
@@ -100,9 +93,10 @@
     public String unspecified() {
 	return "authoring/AuthoringTabsHolder";
     }
-    
+
     @RequestMapping("/authoring")
-    public String execute(@ModelAttribute QaAuthoringForm authoringForm, HttpServletRequest request) throws IOException, ServletException, QaApplicationException {
+    public String execute(@ModelAttribute("authoringForm") QaAuthoringForm authoringForm, HttpServletRequest request)
+	    throws IOException, ServletException, QaApplicationException {
 
 	QaUtils.cleanUpSessionAbsolute(request);
 
@@ -160,7 +154,6 @@
 	// get rating criterias from DB
 	List<RatingCriteria> ratingCriterias = qaService.getRatingCriterias(qaContent.getQaContentId());
 	sessionMap.put(AttributeNames.ATTR_RATING_CRITERIAS, ratingCriterias);
-	request.setAttribute("authoringForm", authoringForm);
 
 	return "authoring/AuthoringTabsHolder";
     }
@@ -170,27 +163,27 @@
      *
      * @param request
      * @param mapping
-     * @param qaAuthoringForm
+     * @param authoringForm
      * @param mapQuestionContent
      * @param toolContentID
      * @return ActionForward
      */
-    protected QaContent prepareDTOandForm(HttpServletRequest request, QaAuthoringForm qaAuthoringForm,
+    protected QaContent prepareDTOandForm(HttpServletRequest request,@ModelAttribute("authoringForm") QaAuthoringForm authoringForm,
 	    QaContent qaContent, IQaService qaService, SessionMap<String, Object> sessionMap) {
 
-	qaAuthoringForm.setUsernameVisible(qaContent.isUsernameVisible() ? "1" : "0");
-	qaAuthoringForm.setAllowRateAnswers(qaContent.isAllowRateAnswers() ? "1" : "0");
-	qaAuthoringForm.setNotifyTeachersOnResponseSubmit(qaContent.isNotifyTeachersOnResponseSubmit() ? "1" : "0");
-	qaAuthoringForm.setShowOtherAnswers(qaContent.isShowOtherAnswers() ? "1" : "0");
-	qaAuthoringForm.setQuestionsSequenced(qaContent.isQuestionsSequenced() ? "1" : "0");
-	qaAuthoringForm.setLockWhenFinished(qaContent.isLockWhenFinished() ? "1" : "0");
-	qaAuthoringForm.setNoReeditAllowed(qaContent.isNoReeditAllowed() ? "1" : "0");
-	qaAuthoringForm.setMaximumRates(qaContent.getMaximumRates());
-	qaAuthoringForm.setMinimumRates(qaContent.getMinimumRates());
-	qaAuthoringForm.setReflect(qaContent.isReflect() ? "1" : "0");
-	qaAuthoringForm.setReflectionSubject(qaContent.getReflectionSubject());
-	qaAuthoringForm.setTitle(qaContent.getTitle());
-	qaAuthoringForm.setInstructions(qaContent.getInstructions());
+	authoringForm.setUsernameVisible(qaContent.isUsernameVisible() ? "1" : "0");
+	authoringForm.setAllowRateAnswers(qaContent.isAllowRateAnswers() ? "1" : "0");
+	authoringForm.setNotifyTeachersOnResponseSubmit(qaContent.isNotifyTeachersOnResponseSubmit() ? "1" : "0");
+	authoringForm.setShowOtherAnswers(qaContent.isShowOtherAnswers() ? "1" : "0");
+	authoringForm.setQuestionsSequenced(qaContent.isQuestionsSequenced() ? "1" : "0");
+	authoringForm.setLockWhenFinished(qaContent.isLockWhenFinished() ? "1" : "0");
+	authoringForm.setNoReeditAllowed(qaContent.isNoReeditAllowed() ? "1" : "0");
+	authoringForm.setMaximumRates(qaContent.getMaximumRates());
+	authoringForm.setMinimumRates(qaContent.getMinimumRates());
+	authoringForm.setReflect(qaContent.isReflect() ? "1" : "0");
+	authoringForm.setReflectionSubject(qaContent.getReflectionSubject());
+	authoringForm.setTitle(qaContent.getTitle());
+	authoringForm.setInstructions(qaContent.getInstructions());
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, qaContent.getTitle());
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, qaContent.getInstructions());
 
@@ -229,7 +222,7 @@
 	List<QaQuestionDTO> listDeletedQuestionDTOs = new ArrayList<>();
 	sessionMap.put(QaAppConstants.LIST_DELETED_QUESTION_DTOS, listDeletedQuestionDTOs);
 
-	qaAuthoringForm.resetUserAction();
+	authoringForm.resetUserAction();
 
 	return qaContent;
     }
@@ -244,7 +237,7 @@
      * @param mapping
      * @return ActionForward
      */
-    public boolean validateDefaultContent(HttpServletRequest request, QaAuthoringForm authoringForm) {
+    public boolean validateDefaultContent(HttpServletRequest request,@ModelAttribute("authoringForm") QaAuthoringForm authoringForm) {
 
 	/*
 	 * retrieve the default content id based on tool signature
@@ -308,7 +301,7 @@
      * submits content into the tool database
      */
     @RequestMapping("/submitAllContent")
-    public String submitAllContent(QaAuthoringForm authoringForm, HttpServletRequest request)
+    public String submitAllContent(@ModelAttribute("authoringForm") QaAuthoringForm authoringForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
 	String httpSessionID = authoringForm.getHttpSessionID();
@@ -421,7 +414,6 @@
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
 	sessionMap.put(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
-	request.setAttribute("authoringForm", authoringForm);
 
 	return "authoring/AuthoringTabsHolder";
     }
@@ -602,7 +594,7 @@
      * saveSingleQuestion
      */
     @RequestMapping("/saveSingleQuestion")
-    public String saveSingleQuestion(@ModelAttribute("newQuestionForm")QaAuthoringForm newQuestionForm, HttpServletRequest request)
+    public String saveSingleQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
@@ -716,15 +708,16 @@
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
 	request.setAttribute("authoringForm", newQuestionForm);
+	
 	return "authoring/AuthoringTabsHolder";
     }
 
     /**
      * addSingleQuestion
      */
     @RequestMapping("/addSingleQuestion")
-    public String addSingleQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
-	    throws IOException, ServletException {
+    public String addSingleQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm,
+	    HttpServletRequest request) throws IOException, ServletException {
 
 	String httpSessionID = newQuestionForm.getHttpSessionID();
 
@@ -793,28 +786,28 @@
      * opens up an new screen within the current page for adding a new question
      */
     @RequestMapping("/newQuestionBox")
-    public String newQuestionBox(@ModelAttribute QaAuthoringForm authoringForm, HttpServletRequest request)
+    public String newQuestionBox(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = authoringForm.getHttpSessionID();
+	String httpSessionID = newQuestionForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
-	authoringForm.setContentFolderID(contentFolderID);
+	newQuestionForm.setContentFolderID(contentFolderID);
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 
-	authoringForm.setTitle(richTextTitle);
-	authoringForm.setInstructions(richTextInstructions);
+	newQuestionForm.setTitle(richTextTitle);
+	newQuestionForm.setInstructions(richTextInstructions);
 
-	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, newQuestionForm, strToolContentID, httpSessionID);
 
 	Collection<QaQuestionDTO> questionDTOs = (Collection<QaQuestionDTO>) sessionMap
 		.get(QaAppConstants.LIST_QUESTION_DTOS);
@@ -828,25 +821,24 @@
 	    request.setAttribute(QaAppConstants.ATTR_WIZARD_CATEGORIES, qaService.getWizardCategories());
 	}
 
-	request.setAttribute("authoringForm", authoringForm);
 	return "authoring/newQuestionBox";
     }
 
     /**
      * opens up an new screen within the current page for editing a question
      */
     @RequestMapping("/newEditableQuestionBox")
-    public String newEditableQuestionBox(QaAuthoringForm authoringForm, HttpServletRequest request)
+    public String newEditableQuestionBox(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = authoringForm.getHttpSessionID();
+	String httpSessionID = newQuestionForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
 	String questionIndex = request.getParameter("questionIndex");
 
-	authoringForm.setEditableQuestionIndex(questionIndex);
+	newQuestionForm.setEditableQuestionIndex(questionIndex);
 
 	List<QaQuestionDTO> questionDTOs = (List<QaQuestionDTO>) sessionMap.get(QaAppConstants.LIST_QUESTION_DTOS);
 
@@ -872,25 +864,24 @@
 	}
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	authoringForm.setContentFolderID(contentFolderID);
+	newQuestionForm.setContentFolderID(contentFolderID);
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 
-	authoringForm.setTitle(richTextTitle);
-	authoringForm.setInstructions(richTextInstructions);
+	newQuestionForm.setTitle(richTextTitle);
+	newQuestionForm.setInstructions(richTextInstructions);
 
-	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, newQuestionForm, strToolContentID, httpSessionID);
 
-	authoringForm.setRequired(requiredBoolean);
-	authoringForm.setMinWordsLimit(minWordsLimit);
-	authoringForm.setEditableQuestionText(editableQuestion);
-	authoringForm.setFeedback(editableFeedback);
+	newQuestionForm.setRequired(requiredBoolean);
+	newQuestionForm.setMinWordsLimit(minWordsLimit);
+	newQuestionForm.setEditableQuestionText(editableQuestion);
+	newQuestionForm.setFeedback(editableFeedback);
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
-	request.setAttribute("authoringForm", authoringForm);
 
 	return "authoring/newQuestionBox";
     }
@@ -899,10 +890,10 @@
      * removes a question from the questions map
      */
     @RequestMapping("/removeQuestion")
-    public String removeQuestion(QaAuthoringForm authoringForm, HttpServletRequest request)
+    public String removeQuestion(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = authoringForm.getHttpSessionID();
+	String httpSessionID = newQuestionForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
@@ -952,20 +943,20 @@
 	}
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	authoringForm.setContentFolderID(contentFolderID);
+	newQuestionForm.setContentFolderID(contentFolderID);
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 	String richTextInstructions = request.getParameter(QaAppConstants.INSTRUCTIONS);
 	sessionMap.put(QaAppConstants.ACTIVITY_TITLE_KEY, richTextTitle);
 	sessionMap.put(QaAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions);
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
-	authoringForm.setTitle(richTextTitle);
-	authoringForm.setInstructions(richTextInstructions);
+	newQuestionForm.setTitle(richTextTitle);
+	newQuestionForm.setInstructions(richTextInstructions);
 	request.getSession().setAttribute(httpSessionID, sessionMap);
-	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
-	authoringForm.setToolContentID(strToolContentID);
-	authoringForm.setHttpSessionID(httpSessionID);
-	authoringForm.setCurrentTab("1");
-	request.setAttribute("authoringForm", authoringForm);
+	QaUtils.setFormProperties(request, newQuestionForm, strToolContentID, httpSessionID);
+	newQuestionForm.setToolContentID(strToolContentID);
+	newQuestionForm.setHttpSessionID(httpSessionID);
+	newQuestionForm.setCurrentTab("1");
+	request.setAttribute("authoringForm", newQuestionForm);
 
 	return "authoring/AuthoringTabsHolder";
     }
@@ -974,10 +965,10 @@
      * moves a question down in the list
      */
     @RequestMapping("/moveQuestionDown")
-    public String moveQuestionDown(QaAuthoringForm authoringForm, HttpServletRequest request)
+    public String moveQuestionDown(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = authoringForm.getHttpSessionID();
+	String httpSessionID = newQuestionForm.getHttpSessionID();
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
 
@@ -995,7 +986,7 @@
 	sessionMap.put(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
-	authoringForm.setContentFolderID(contentFolderID);
+	newQuestionForm.setContentFolderID(contentFolderID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 
@@ -1006,31 +997,31 @@
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
-	authoringForm.setTitle(richTextTitle);
-	authoringForm.setInstructions(richTextInstructions);
+	newQuestionForm.setTitle(richTextTitle);
+	newQuestionForm.setInstructions(richTextInstructions);
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, newQuestionForm, strToolContentID, httpSessionID);
 
-	authoringForm.setToolContentID(strToolContentID);
-	authoringForm.setHttpSessionID(httpSessionID);
-	authoringForm.setCurrentTab("1");
+	newQuestionForm.setToolContentID(strToolContentID);
+	newQuestionForm.setHttpSessionID(httpSessionID);
+	newQuestionForm.setCurrentTab("1");
 
 	request.setAttribute(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
-	request.setAttribute("authoringForm", authoringForm);
+	request.setAttribute("authoringForm", newQuestionForm);
 	return "authoring/AuthoringTabsHolder";
     }
 
     /**
      * moves a question up in the list
      */
     @RequestMapping("/moveQuestionUp")
-    public String moveQuestionUp(QaAuthoringForm authoringForm, HttpServletRequest request)
+    public String moveQuestionUp(@ModelAttribute("newQuestionForm") QaAuthoringForm newQuestionForm, HttpServletRequest request)
 	    throws IOException, ServletException {
 
-	String httpSessionID = authoringForm.getHttpSessionID();
+	String httpSessionID = newQuestionForm.getHttpSessionID();
 
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
 		.getAttribute(httpSessionID);
@@ -1049,7 +1040,7 @@
 
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
-	authoringForm.setContentFolderID(contentFolderID);
+	newQuestionForm.setContentFolderID(contentFolderID);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
 
@@ -1060,21 +1051,21 @@
 
 	String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
 
-	authoringForm.setTitle(richTextTitle);
-	authoringForm.setInstructions(richTextInstructions);
+	newQuestionForm.setTitle(richTextTitle);
+	newQuestionForm.setInstructions(richTextInstructions);
 
 	request.getSession().setAttribute(httpSessionID, sessionMap);
 
-	QaUtils.setFormProperties(request, authoringForm, strToolContentID, httpSessionID);
+	QaUtils.setFormProperties(request, newQuestionForm, strToolContentID, httpSessionID);
 
-	authoringForm.setToolContentID(strToolContentID);
-	authoringForm.setHttpSessionID(httpSessionID);
-	authoringForm.setCurrentTab("1");
+	newQuestionForm.setToolContentID(strToolContentID);
+	newQuestionForm.setHttpSessionID(httpSessionID);
+	newQuestionForm.setCurrentTab("1");
 
 	request.setAttribute(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
-	request.setAttribute("authoringForm", authoringForm);
+	request.setAttribute("authoringForm", newQuestionForm);
 	return "authoring/AuthoringTabsHolder";
     }
 
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -32,7 +32,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +122,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
+		<a href="javascript:doSubmit_Form_Only();" id="saveButton" name="submit" class="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+		</a>
+		<a href="javascript:;" name="cancel" id="cancelButton" onclick="javascript:doCancel()" class="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
+		</a>
 </div>
 <!-- end tab content -->
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -8,9 +8,9 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 
 <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %>
@@ -284,42 +284,42 @@
 					<label for="minimum-rates">
 						<fmt:message key="${minimumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}minimumRates" id="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							class="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMinimumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				
 					<label for="maximum-rates">
 						<fmt:message key="${maximumLabel}" />
 					</label>
-					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
-							styleClass="form-control form-control-inline">
-						<html:option value="0">
+					<form:select path="${formContentPrefix}maximumRates" id="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							class="form-control form-control-inline">
+						<form:option value="0">
 							<fmt:message key="${noMaximumLabel}" />
-						</html:option>
-						<html:option value="1">1</html:option>
-						<html:option value="2">2</html:option>
-						<html:option value="3">3</html:option>
-						<html:option value="4">4</html:option>
-						<html:option value="5">5</html:option>
-						<html:option value="6">6</html:option>
-						<html:option value="7">7</html:option>
-						<html:option value="8">8</html:option>
-						<html:option value="9">9</html:option>
-						<html:option value="10">10</html:option>
-					</html:select>
+						</form:option>
+						<form:option value="1">1</form:option>
+						<form:option value="2">2</form:option>
+						<form:option value="3">3</form:option>
+						<form:option value="4">4</form:option>
+						<form:option value="5">5</form:option>
+						<form:option value="6">6</form:option>
+						<form:option value="7">7</form:option>
+						<form:option value="8">8</form:option>
+						<form:option value="9">9</form:option>
+						<form:option value="10">10</form:option>
+					</form:select>
 				</div>
 			</c:if>
 	
Index: lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -1,7 +1,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
@@ -42,23 +42,23 @@
 
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowCommentsVariableName}" value="1"
-		styleId="${allowCommentsVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowCommentsVariableName}" value="1"
+		id="${allowCommentsVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowCommentLabelKey}"/>
 	</label>
 </div>
 
 <div id="likedislike">
 <div class="loffset20">
-		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
-		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
+		<form:radio path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radio path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
-		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	<form:checkbox path="${allowAnonymousVariableName}" 
+		id="${allowAnonymousVariableName}">
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -4,6 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
 <%@ attribute name="style" required="false" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
 					</c:if>
 				</c:if>
 			</c:if>
-			<c:if test="${empty toolSessionId}">
-				<c:set var="toolForm" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+			<c:if test="${empty toolSessionId and not empty formID}">
+				<c:set var="toolForm" value="${requestScope[formID]}" />
 				<c:if test="${not empty toolForm}"> 
 				    <c:set var="toolSessionId"><c:catch var="exception">${toolForm.toolSessionID}</c:catch></c:set>
 				</c:if>
Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -8,7 +8,6 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_tool_laqa/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -34,7 +34,6 @@
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <c:set var="class" value=""/>
 <c:if test="${id == 1}">
Index: lams_tool_laqa/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -30,7 +30,6 @@
 
 %>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 
 <div class="panel-body panel-monitor-body">
 	 <jsp:doBody />
Index: lams_tool_laqa/web/authoring/addCondition.jsp
===================================================================
diff -u -r5f5d164117e56516c294f276bbaa4a33e2108372 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
+++ lams_tool_laqa/web/authoring/addCondition.jsp	(.../addCondition.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -19,7 +19,7 @@
 			</div>
 	
 			<%-- Text search form fields are being included --%>
-			<lams:TextSearch wrapInFormTag="false" sessionMapID="${sessionMapID}"  />
+			<lams:TextSearch sessionMapID="${sessionMapID}"  />
 						
 			<h4><fmt:message key="textsearch.questions" /></h4>
 			<c:forEach var="itemE" items="${QaConditionForm.possibleItems}">
Index: lams_tool_laqa/web/authoring/conditions.jsp
===================================================================
diff -u -r5f5d164117e56516c294f276bbaa4a33e2108372 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 5f5d164117e56516c294f276bbaa4a33e2108372)
+++ lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -48,12 +48,12 @@
 
 <!-- Conditions Tab Content -->
 <div id="conditionsArea">
-	<c:set var="sessionMapID" value="${QaConditionForm.httpSessionID}" />
+	<c:set var="sessionMapID" value="${authoringForm.httpSessionID}" />
 	<%@ include file="/authoring/conditionList.jsp"%>
 </div>
  
  <div class="form-inline">
-	<a href="javascript:showConditionMessage('<lams:WebAppURL/>authoringConditions/newConditionInit.do?sessionMapID=${QaConditionForm.httpSessionID}');" 
+	<a href="javascript:showConditionMessage('../authoringConditions/newConditionInit.do?sessionMapID=${authoringForm.httpSessionID}');" 
 		class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.conditions.add.condition" /></a> 
 </div>
 
Index: lams_tool_laqa/web/authoring/itemlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -1,5 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <div id="itemList">
 	<table class="table table-striped table-condensed">
Index: lams_tool_laqa/web/common/messages.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/common/messages.jsp	(.../messages.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/common/messages.jsp	(.../messages.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -11,7 +11,7 @@
 <%-- Success Messages --%>
  <c:set var="infokey" value="GLOBALINFO" /> 
  <c:if test="${not empty infoMap and not empty infoMap[infokey]}"> 
-     <lams:Alert id="message" message="false"> 
+     <lams:Alert type="info"> 
          <c:forEach var="info" items="${infoMap[infokey]}"> 
              <c:out value="${info}" /><br /> 
          </c:forEach> 
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -17,21 +17,21 @@
 <body class="stripes">
 
 <!-- form needs to be outside page so that the form bean can be picked up by Page tag. -->
-<html:form action="/learning?validate=false" styleId="reflectionForm" onsubmit="disableFinishButton()">
+<form:form action="/learning.do" modelAttribute="reflectionForm" id="dreflectionForm" onsubmit="disableFinishButton()">
 
 <lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
-		<html:hidden property="method" value="submitReflection"/>
-		<html:hidden property="toolSessionID" />
-		<html:hidden property="userID" />
-		<html:hidden property="httpSessionID" />
-		<html:hidden property="totalQuestionCount" />
+		<form:hidden path="method" value="submitReflection"/>
+		<form:hidden path="toolSessionID" />
+		<form:hidden path="userID" />
+		<form:hidden path="httpSessionID" />
+		<form:hidden path="totalQuestionCount" />
 
 			<p>
 				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</p>
 
-			<html:textarea styleId="focused" rows="5" property="entryText" styleClass="form-control"></html:textarea>
+			<form:textarea id="focused" rows="5" path="entryText" cssClass="form-control"></form:textarea>
 
 			
 				<button id="finishButton" class="btn btn-primary voffset5 pull-right na">
@@ -50,7 +50,7 @@
 	<div id="footer"></div>
 </lams:Page>
 
-</html:form>
+</form:form>
 
 
 <script type="text/javascript">
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -11,15 +11,15 @@
 <c:set var="isLeadershipEnabled" value="${qaContent.useSelectLeaderToolOuput}" />
 <c:set var="isCommentsEnabled" value="${sessionMap.isCommentsEnabled}" />
 <c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}" />
-<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<c:set var="localeLanguage"><lams:user name="localeLanguage" /></c:set>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
-	<link rel="stylesheet" href="<html:rewrite page='/includes/css/qalearning.css'/>">
+	<link rel="stylesheet" href="<lams:WebAppURL/>includes/css/qalearning.css">
 	<lams:css />
 
 	<script src="${lams}includes/javascript/jquery.timeago.js" type="text/javascript"></script>
@@ -351,10 +351,10 @@
 		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' 
 				&& (generalLearnerFlowDTO.lockWhenFinished != 'true') && hasEditRight}">
 			<div style="overflow: hidden;">
-				<html:button property="redoQuestions" styleClass="btn btn-default pull-left"
+				<button name="redoQuestions" class="btn btn-default pull-left"
 					onclick="submitMethod('redoQuestions');">
 					<fmt:message key="label.redo" />
-				</html:button>
+				</button>
 			</div>
 		</c:if>
 
@@ -434,10 +434,10 @@
 							</div>
 
 							<c:if test="${hasEditRight}">
-								<html:button property="forwardtoReflection" styleClass="btn btn-default pull-left"
+								<button name="forwardtoReflection" class="btn btn-default pull-left"
 									onclick="submitMethod('forwardtoReflection');">
 									<fmt:message key="label.edit" />
-								</html:button>
+								</button>
 							</c:if>
 						</div>
 					</div>
@@ -465,13 +465,13 @@
 			</div>
 		</c:if>
 
-		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
-			<html:hidden property="method" />
-			<html:hidden property="toolSessionID" styleId="toolSessionID" />
-			<html:hidden property="userID" styleId="userID" />
-			<html:hidden property="httpSessionID" />
-			<html:hidden property="totalQuestionCount" />
-		</html:form>
+		<form:form action="/learning.do" method="POST" target="_self">
+			<form:hidden path="method" />
+			<form:hidden path="toolSessionID" id="toolSessionID" />
+			<form:hidden path="userID" id="userID" />
+			<form:hidden path="httpSessionID" />
+			<form:hidden path="totalQuestionCount" />
+		</form:form>
 
 
 		<div id="footer"></div>
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	(.../SequentialAnswersContent.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -1,6 +1,3 @@
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
@@ -56,7 +53,7 @@
 							</c:choose>
 						</div>
 
-						<html:hidden property="currentQuestionIndex" value="${questionEntry.key}" />
+						<form:hidden path="currentQuestionIndex"><c:out value="${questionEntry.key}" /></form:hidden>
 	</c:if>
 </c:forEach>
 
Index: lams_tool_laqa/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -32,12 +32,12 @@
 
 	<lams:Page type="learner" title="${generalLearnerFlowDTO.activityTitle}">
 
-		<html:form action="/learning?validate=false" method="POST" styleId="form">
-			<html:hidden property="method" />
-			<html:hidden property="toolSessionID" />
-			<html:hidden property="userID" />
-			<html:hidden property="httpSessionID" />
-			<html:hidden property="totalQuestionCount" />
+		<form:form action="/learning.do" method="POST" modelAttribute="form" id="form">
+			<form:hidden property="method" />
+			<form:hidden property="toolSessionID" />
+			<form:hidden property="userID" />
+			<form:hidden property="httpSessionID" />
+			<form:hidden property="totalQuestionCount" />
 
 
 			<lams:Alert type="danger" id="submission-deadline" close="false">
@@ -51,8 +51,8 @@
 			<div class="right-buttons">
 
 				<c:if test="${generalLearnerFlowDTO.reflection != 'true'}">
-					<html:link href="#nogo" property="endLearning" styleId="finishButton"
-						onclick="javascript:submitMethod('endLearning');return false" styleClass="btn btn-primary pull-right">
+					<a href="#nogo" name="endLearning" id="finishButton"
+						onclick="javascript:submitMethod('endLearning');return false" class="btn btn-primary pull-right">
 						<span class="na"> <c:choose>
 								<c:when test="${sessionMap.activityPosition.last}">
 									<fmt:message key="button.submit" />
@@ -62,18 +62,18 @@
 								</c:otherwise>
 							</c:choose>
 						</span>
-					</html:link>
+					</a>
 				</c:if>
 
 				<c:if test="${generalLearnerFlowDTO.reflection == 'true'}">
-					<html:button property="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
-						styleClass="btn btn-primary pull-right">
+					<button name="forwardtoReflection" onclick="javascript:submitMethod('forwardtoReflection');"
+						class="btn btn-primary pull-right">
 						<fmt:message key="label.continue" />
-					</html:button>
+					</button>
 				</c:if>
 
 			</div>
-		</html:form>
+		</form:form>
 
 		<div id="footer"></div>
 	</lams:Page>
Index: lams_tool_laqa/web/monitoring/Edit.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -1,6 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
 
 <table class="table table-condensed">
 	<tr>
@@ -22,11 +21,11 @@
 	</tr>
 </table>
 
-<c:url value="/authoringStarter.do" var="authoringUrl">
+<c:url value="/authoring/authoring.do" var="authoringUrl">
 	<c:param name="mode" value="teacher" />
-	<c:param name="toolContentID" value="${formBean.toolContentID}" />
-	<c:param name="contentFolderID" value="${formBean.contentFolderID}" />
+	<c:param name="toolContentID" value="${authoringForm.toolContentID}" />
+	<c:param name="contentFolderID" value="${authoringForm.contentFolderID}" />
 </c:url>
-<html:link href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" styleClass="btn btn-default pull-right">
+<a href="javascript:;" onclick="launchPopup('${authoringUrl}','definelater')" class="btn btn-default pull-right">
 	<fmt:message key="label.edit" />
-</html:link>
\ No newline at end of file
+</a>
\ No newline at end of file
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -11,7 +11,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
-<c:set var="localeLanguage"><lams:user property="localeLanguage" /></c:set>
+<c:set var="localeLanguage"><lams:user name="localeLanguage" /></c:set>
 
 <lams:html>
 	<lams:head>
@@ -23,7 +23,7 @@
 	<lams:css suffix="jquery.jRating"/>
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css"> 
-	<link type="text/css" rel="stylesheet" href="<html:rewrite page='/includes/css/qalearning.css'/>">
+	<link type="text/css" rel="stylesheet" href="<lams:WebAppURL/>includes/css/qalearning.css">
 	<style media="screen,projection" type="text/css">
 		.rating-stars-div {
 			padding-top: 12px;
@@ -349,14 +349,13 @@
 </lams:head>
 <body class="stripes">
 
-<html:form action="/monitoring?validate=false" method="POST" enctype="multipart/form-data" >
+<form:form action="/monitoring.do" method="POST" >
 	<c:set var="title"><fmt:message key="activity.title" /></c:set>
 	
-	<html:hidden property="dispatch"/>
-	<html:hidden property="currentUid"/>
-	<html:hidden property="toolContentID"/>
-	<html:hidden property="httpSessionID"/>					
-	<html:hidden property="contentFolderID"/>	
+	<form:hidden path="currentUid"/>
+	<form:hidden path="toolContentID"/>
+	<form:hidden path="httpSessionID"/>					
+	<form:hidden path="contentFolderID"/>	
 	
 	<lams:Page title="${title}" type="navbar">
 	
@@ -391,6 +390,6 @@
 			</c:choose>
 		</div>
 	</lams:Page>
-</html:form>
+</form:form>
 </body>
 </lams:html>
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -41,17 +41,17 @@
 	<c:if test="${content.reflect}"> 			
 		<div style="margin-bottom: 20px">
 			<c:set var="viewReflectionsURL"><lams:WebAppURL/>/monitoring/Reflections.jsp?toolSessionID=${groupDto.sessionId}</c:set>
-			<html:button property="viewAllMarks" onclick="javascript:launchPopup('${viewReflectionsURL}')"
-					styleClass="btn btn-default loffset5 voffset10" >
+			<button name="viewAllMarks" onclick="javascript:launchPopup('${viewReflectionsURL}')"
+					class="btn btn-default loffset5 voffset10" >
 				<fmt:message key="label.notebook.entries" />
-			</html:button>
+			</button>
 		</div>
 	</c:if>
 				  	
 	<c:forEach var="question" items="${questionDTOs}">
 		<div class="panel panel-default"">
 			<div class="panel-heading">
-				<a href="javascript:launchPopup('<html:rewrite page="/monitoring.do?dispatch=getPrintAnswers&questionUid=${question.uid}&toolSessionID=${groupDto.sessionId}"/>');"	
+				<a href="javascript:launchPopup('<lams:WebAppURL/>monitoring.getPrintAnswers.do?questionUid=${question.uid}&toolSessionID=${groupDto.sessionId}');"	
 					id="printAnswers" class="btn btn-default btn-xs pull-right"><i class="fa fa-print"></i></a>
 				<c:out value="${question.question}" escapeXml="false"/>
 			</div>
Index: lams_tool_laqa/web/monitoring/dateRestriction.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_laqa/web/monitoring/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_laqa/web/monitoring/dateRestriction.jsp	(.../dateRestriction.jsp)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -49,9 +49,9 @@
 		<label for="datetime"><fmt:message key="monitor.summary.after.date" />&nbsp;
 		<input type="text" name="datetime" id="datetime" value="" class="form-control form-control-inline"/>
 		</label>							
-		<html:link	href="javascript:storeShowOtherAnswersAfterDeadline(); setSubmissionDeadline();" styleClass="btn btn-default">
+		<a	href="javascript:storeShowOtherAnswersAfterDeadline(); setSubmissionDeadline();" class="btn btn-default">
 			<fmt:message key="monitor.summary.set.restriction" />
-		</html:link>
+		</a>
 		</div>
 	</div>
 
@@ -60,9 +60,9 @@
 		<span id="dateInfo">
 		</span>
 		</label>
-		<html:link	href="javascript:$('#show-other-answers-after-deadline').prop('checked', false); removeSubmissionDeadline();" styleClass="btn btn-default">
+		<a	href="javascript:$('#show-other-answers-after-deadline').prop('checked', false); removeSubmissionDeadline();" class="btn btn-default">
 			<fmt:message key="monitor.summary.unset.restriction" />
-		</html:link>
+		</a>
 	</div>
 	
 	<div class="checkbox">
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java
===================================================================
diff -u -r280d5dec6be0fb026eb13b77a507e454ac0219ba -r658034e7f07579dd682db62112b9353b3a0d3f65
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 280d5dec6be0fb026eb13b77a507e454ac0219ba)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 658034e7f07579dd682db62112b9353b3a0d3f65)
@@ -127,7 +127,8 @@
      * @return
      */
     @RequestMapping("/removeItem")
-    private String removeItem(ResourceItemForm resourceItemForm, HttpServletRequest request) {
+    private String removeItem(@ModelAttribute("resourceItemForm") ResourceItemForm resourceItemForm,
+	    HttpServletRequest request) {
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
@@ -146,7 +147,6 @@
 	    delList.add(item);
 	}
 
-	request.setAttribute("resourceItemForm", resourceItemForm);
 	request.setAttribute(ResourceConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return "pages/authoring/parts/itemlist";
     }
@@ -159,7 +159,8 @@
      * @return
      */
     @RequestMapping("/editItemInit")
-    private String editItemInit(ResourceItemForm resourceItemForm, HttpServletRequest request) {
+    private String editItemInit(@ModelAttribute("resourceItemForm") ResourceItemForm resourceItemForm,
+	    HttpServletRequest request) {
 
 	// get back sessionMAP
 	String sessionMapID = WebUtil.readStrParam(request, ResourceConstants.ATTR_SESSION_MAP_ID);
@@ -176,7 +177,6 @@
 		populateItemToForm(itemIdx, item, resourceItemForm, request);
 	    }
 	}
-	request.setAttribute("resourceItemForm", resourceItemForm);
 	switch (item.getType()) {
 	    case 1:
 		return "pages/authoring/parts/addurl";
@@ -528,7 +528,6 @@
 	sessionMap.put(ResourceConstants.ATTR_RESOURCE_FORM, startForm);
 	request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL,
 		request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL));
-	request.setAttribute("startForm", startForm);
 
 	return "pages/authoring/start";
     }
@@ -978,12 +977,11 @@
 		|| resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_LEARNING_OBJECT
 		|| resourceItemForm.getItemType() == ResourceConstants.RESOURCE_TYPE_FILE) {
 	    // validate item size
-	    if(!FileValidatorSpringUtil.validateFileSize(resourceItemForm.getFile().getSize(),
-		    false)) {
+	    if (!FileValidatorSpringUtil.validateFileSize(resourceItemForm.getFile().getSize(), false)) {
 		errorMap.add("GLOBAL", messageService.getMessage("errors.maxfilesize",
-			    new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE) }));
+			new Object[] { Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE) }));
 	    }
-	    
+
 	    // for edit validate: file already exist
 	    if (!resourceItemForm.isHasFile() && (resourceItemForm.getFile() == null
 		    || StringUtils.isEmpty(resourceItemForm.getFile().getOriginalFilename()))) {