Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -216,7 +216,7 @@
      */
     @RequestMapping("/author")
     public String author(HttpServletRequest req, HttpServletResponse res) throws IOException {
-	String url = Configuration.get(ConfigurationKeys.SERVER_URL) + "authoring/author.do?method=openAuthoring";
+	String url = Configuration.get(ConfigurationKeys.SERVER_URL) + "authoring/author/openAuthoring.do";
 	Long learningDesignID = WebUtil.readLongParam(req, "learningDesignID", true);
 
 	if (learningDesignID != null) {
@@ -247,7 +247,7 @@
 
 	// security check will be done there
 	String url = Configuration.get(ConfigurationKeys.SERVER_URL)
-		+ "monitoring/monitoring.do?method=monitorLesson&lessonID=" + lessonId;
+		+ "monitoring/monitoring/monitorLesson.do?lessonID=" + lessonId;
 	res.sendRedirect(url);
 	return null;
     }
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java	(.../LoginAsController.java)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginAsController.java	(.../LoginAsController.java)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -105,7 +105,7 @@
 		    // notify the login module that the user has been authenticated correctly
 		    UniversalLoginModule.setAuthenticationToken(token);
 		    // redirect to login page
-		    return "login.jsp?redirectURL=/lams/index";
+		    return "redirect:login.jsp?redirectURL=/lams/index";
 		}
 	    }
 	} else {
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -32,7 +32,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +123,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_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
@@ -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_central/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,5 +1,5 @@
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -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:radiobutton path="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
+		<form:radiobutton path="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
 <div class="checkbox">
 	<label>
-	<html:checkbox property="${allowAnonymousVariableName}" 
+	<form:checkbox path="${allowAnonymousVariableName}" 
 		styleId="${allowAnonymousVariableName}">
-	</html:checkbox>
+	</form:checkbox>
 	<fmt:message key="${allowAnonymousLabelKey}"/>
 	</label>
 </div>
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r4e2c39e0ea14d5a8aa406327a16425e81b1e6702 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 4e2c39e0ea14d5a8aa406327a16425e81b1e6702)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -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>
@@ -137,7 +138,7 @@
 				
 			function restartLesson(){
 				if (confirm(restartLessonConfirmation)) {
-					window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
+					window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
 				}
 			}
 
Index: lams_central/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_central/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -8,7 +8,7 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn" %>
 <c:set var="lams"><lams:LAMSURL/></c:set>
Index: lams_central/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -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_central/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -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_central/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -32,12 +32,11 @@
 <%@ tag body-content="scriptless" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <%-- Required attributes --%>
 <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
 
 <%-- Optional attributes --%>
 <%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
 
 <%-- Default value for message key --%>
 <c:if test="${empty action}">
-	<c:set var="action" value="authoring/textsearch.do" scope="request"/>
+	<c:set var="action" value="textsearch.do" scope="request"/>
 </c:if>
 <c:if test="${empty cancelAction}">
-	<c:set var="cancelAction" value="authoring/textsearchCancel.do" scope="request"/>
+	<c:set var="cancelAction" value="textsearchCancel.do" scope="request"/>
 </c:if>
 <c:if test="${empty formID}">
 	<c:set var="formID" value="textSearchForm" scope="request"/>
@@ -85,52 +84,40 @@
 
 <!-- begin text search form content -->
 	
-<c:if test="${wrapInFormTag}">
-	<form action="${action}" id="${formID}" name="${formID}">
-</c:if>
-		<html:hidden property="sessionMapID" />
-		<h4><fmt:message key="${headingLabelKey}" /></h4>
-		<table>
-			<tr>
-				<td>
-					<fmt:message key="${allWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="allWords" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${phraseLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="phrase" />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${anyWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="anyWords" /> 
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<fmt:message key="${excludedWordsLabelKey}" />
-				</td>
-				<td>
-					<html:text size="40" property="excludedWords" /> 
-				</td>
-			</tr>
-		</table>
-<c:if test="${wrapInFormTag}">
-	<lams:ImgButtonWrapper>
-		<a href="#" onclick="${formID}.submit();" class="button-add-item"><fmt:message key="${saveButtonLabelKey}" />
-		</a>
-		<a href="#" onclick="location.href='${cancelAction}'" class="button space-left"><fmt:message key="${cancelButtonLabelKey}" />
-		</a>
-	</lams:ImgButtonWrapper>
-	</form>
-</c:if>
+	<form:hidden path="sessionMapID" />
+	<h4><fmt:message key="${headingLabelKey}" /></h4>
+	<table>
+		<tr>
+			<td>
+				<fmt:message key="${allWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="allWords" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${phraseLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="phrase" />
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${anyWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="anyWords" /> 
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<fmt:message key="${excludedWordsLabelKey}" />
+			</td>
+			<td>
+				<form:input size="40" path="excludedWords" /> 
+			</td>
+		</tr>
+	</table>
 <!-- end text search form content -->
\ No newline at end of file
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -34,7 +34,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringMenu.js"></script>
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
-			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=getLearningDesignThumbnail&ldId=',
+			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
 
 			decoderDiv = $('<div />'),
 			LABELS = {
Index: lams_central/web/authoring/template/comms.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -130,7 +130,7 @@
 			var newDiv = document.createElement("div");
 			newDiv.id = 'divassess'+nextNum;
 			newDiv.className = 'space-top';
-			var url=getSubmissionURL()+"?method=createAssessment&questionNumber="+nextNum+"&questionType="+type;
+			var url=getSubmissionURL()+"/createAssessment.do?questionNumber="+nextNum+"&questionType="+type;
 			$('#divassessments').append(newDiv);
 			$.ajaxSetup({ cache: true });
 			$(newDiv).load(url, function( response, status, xhr ) {
@@ -150,7 +150,7 @@
 			var nextNum = +currNum + 1;
 			var newDiv = document.createElement("div");
 			newDiv.id = newDivPrefix+nextNum;
-			var url=getSubmissionURL()+"?method=createQuestion&questionNumber="+nextNum;
+			var url=getSubmissionURL()+"/createQuestion.do?questionNumber="+nextNum;
 			if ( forward && forward.length > 0) {
 				url = url + "&forward=" + forward;
 			}
@@ -180,7 +180,7 @@
 			var lastChild=optionsDiv.children().filter(':last');
 			$(lastChild).after(newDiv);
 
-			var url=getSubmissionURL()+"?method=createOption&questionNumber="+questionNum+"&optionNumber="+nextNum;
+			var url=getSubmissionURL()+"/createOption.do?questionNumber="+questionNum+"&optionNumber="+nextNum;
 			$.ajaxSetup({ cache: true });
 			$(newDiv).load(url, function( response, status, xhr ) {
 				if ( status == "error" ) {
@@ -209,7 +209,7 @@
 			var lastChild=optionsDiv.children().filter(':last');
 			$(lastChild).after(newDiv);
 
-			var url=getSubmissionURL()+"?method=createOption&questionNumber="+questionNum+"&optionNumber="+nextNum+"&assess=true";
+			var url=getSubmissionURL()+"/createOption.do?questionNumber="+questionNum+"&optionNumber="+nextNum+"&assess=true";
 			$.ajaxSetup({ cache: true });
 			$(newDiv).load(url, function( response, status, xhr ) {
 				if ( status == "error" ) {
@@ -248,7 +248,7 @@
 		
 		function swapOptions(questionNum, optionNum1, optionNum2, divToLoad, assessment) {
 			refreshCKEditors() ;
-			var url=getSubmissionURL()+"?method=swapOption&questionNumber="+questionNum+"&optionNumber1="+optionNum1+"&optionNumber2="+optionNum2;
+			var url=getSubmissionURL()+"/swapOption.do?questionNumber="+questionNum+"&optionNumber1="+optionNum1+"&optionNumber2="+optionNum2;
 			if ( assessment ) {
 				url += "&assess=true";
 			}
@@ -266,7 +266,7 @@
 
 		function removeOption(questionNum, optionNum, divToLoad, assessment) {
 			refreshCKEditors() ;
-			var url=getSubmissionURL()+"?method=deleteOption&questionNumber="+questionNum+"&optionNumber="+optionNum;
+			var url=getSubmissionURL()+"/deleteOption.do?questionNumber="+questionNum+"&optionNumber="+optionNum;
 			if ( assessment ) 
 				url += "&assess=true";
 			var data = getOptionData(questionNum, assessment);
@@ -289,7 +289,7 @@
 			var nextNum = +currNum + 1;
 			var newDiv = document.createElement("div");
 			newDiv.id = newDivPrefix+nextNum;
-			var url=getSubmissionURL()+"?method=createForum&topicNumber="+nextNum;
+			var url=getSubmissionURL()+"/createForum.do?topicNumber="+nextNum;
 			if ( forward && forward.length > 0) {
 				url = url + "&forward=" + forward;
 			}
@@ -313,7 +313,7 @@
 			var nextNumURLS = +currNumURLS + 1;
 			var urlDiv = document.createElement("div");
 			urlDiv.id = newDivPrefix+nextNumURLS;
-			var url=getSubmissionURL()+"?method=createResource&urlNumber="+nextNumURLS;
+			var url=getSubmissionURL()+"/createResource.do?urlNumber="+nextNumURLS;
 			if ( extraParam ) {
 				url = url + extraParam;
 			}
@@ -333,7 +333,7 @@
 			var nextNum = +currNum + 1;
 			var branchDiv = document.createElement("div");
 			branchDiv.id = 'divbranch'+nextNum;
-			var url=getSubmissionURL()+"?method=createBranch&branchNumber="+nextNum;
+			var url=getSubmissionURL()+"/createBranch.do?branchNumber="+nextNum;
 			$('#divbranches').append(branchDiv);
 			$.ajaxSetup({ cache: true });
 			$(branchDiv).load(url, function( response, status, xhr ) {
@@ -352,7 +352,7 @@
 			var newDiv = document.createElement("div");
 			newDiv.id = 'divrating'+nextNum;
 			newDiv.className = 'space-top';
-			var url=getSubmissionURL()+"?method=createRatingCriteria&criteriaNumber="+nextNum;
+			var url=getSubmissionURL()+"/createRatingCriteria.do?criteriaNumber="+nextNum;
 			$('#divratings').append(newDiv);
 			$.ajaxSetup({ cache: true });
 			$(newDiv).load(url, function( response, status, xhr ) {
Index: lams_central/web/authoring/template/list.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/authoring/template/list.jsp	(.../list.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoring/template/list.jsp	(.../list.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -22,7 +22,7 @@
 <lams:Page type="admin" title="${title}">
 <p><fmt:message key="authoring.template.list.introduction"/></p>
 <table class="table table-striped table-bordered">
-<tr><td><a href="${lams}authoring/template/tbl.do?method=init"><fmt:message key="authoring.tbl.template.title"/></a> - <fmt:message key="authoring.tbl.template.description"/></td></tr>
+<tr><td><a href="${lams}authoring/template/tbl/init.do"><fmt:message key="authoring.tbl.template.title"/></a> - <fmt:message key="authoring.tbl.template.description"/></td></tr>
 </table>
 <div class="button-group voffset10">
 <a href="#" id="cancelButton" class="btn btn-default btn-sm pull-left" onclick="javascript:closeWindow()"><span class="cancelIcon"><fmt:message key="button.cancel"/></span></a>
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -2,7 +2,7 @@
 	contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c" %>
 
 <!DOCTYPE html>
@@ -45,14 +45,14 @@
 	<lams:Page type="admin" title="${title}">
 
 		<div class="voffset10 text-center">
-			<html:link href="javascript:;" onclick="javascript:location.href='${param.reEditUrl}'"
-				property="reedit" styleClass="btn btn-primary roffset10">
+			<a href="javascript:;" onclick="javascript:location.href='${param.reEditUrl}'"
+				name="reedit" class="btn btn-primary roffset10">
 				<fmt:message key="label.authoring.re.edit" />&nbsp;<i class="fa fa-pencil-square-o"></i>
-			</html:link>
-			<html:link href="javascript:;" onclick="javascript:closeWindow();" property="close"
-				styleClass="btn btn-primary">
+			</a>
+			<a href="javascript:;" onclick="javascript:closeWindow();" name="close"
+				class="btn btn-primary">
 				<fmt:message key="label.authoring.close" />&nbsp;<i class="fa fa-times-circle-o"></i>
-			</html:link>
+			</a>
 		</div>
 
 	<div id="footer"></div>
Index: lams_central/web/comments/allviewwrapper.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/comments/allviewwrapper.jsp	(.../allviewwrapper.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/allviewwrapper.jsp	(.../allviewwrapper.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -4,7 +4,7 @@
 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 <c:set var="lams">
Index: lams_central/web/comments/comments.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/comments.jsp	(.../comments.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -2,7 +2,7 @@
 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 
Index: lams_central/web/comments/edit.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/comments/edit.jsp	(.../edit.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/edit.jsp	(.../edit.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,6 +1,6 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
Index: lams_central/web/comments/msgviewwrapper.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/comments/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/msgviewwrapper.jsp	(.../msgviewwrapper.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 <%-- Wraps up msgview.jsp for returning a single message - called when an edit is performed. It needs to do all the setup that topicview.jsp normally does. --%>
Index: lams_central/web/comments/new.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/comments/new.jsp	(.../new.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/new.jsp	(.../new.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,6 +1,6 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
Index: lams_central/web/comments/reply.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/comments/reply.jsp	(.../reply.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/reply.jsp	(.../reply.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,6 +1,6 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 <%@ page import="org.lamsfoundation.lams.comments.CommentConstants"%>
Index: lams_central/web/comments/topicviewwrapper.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/comments/topicviewwrapper.jsp	(.../topicviewwrapper.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/comments/topicviewwrapper.jsp	(.../topicviewwrapper.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -4,7 +4,7 @@
 
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 
 <c:set var="lams">
Index: lams_central/web/editLessonIntro.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -4,7 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <c:set var="lams" ><lams:LAMSURL/></c:set>
 
 <lams:html>
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,10 +1,8 @@
 <!DOCTYPE html>
 
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
@@ -53,16 +51,19 @@
 </lams:head>
 
 <body>
-	<html:form action="/saveprofile.do" method="post" styleId='newForm'>
-		<html:hidden property="userId" />
-		<html:hidden property="login" />
-		<html:hidden property="password" />
+	<form:form action="saveprofile.do" modelAttribute='newForm' method="post" id='newForm'>
+		<form:hidden path="userId" />
+		<form:hidden path="login" />
+		<form:hidden path="password" />
 
-		<logic:messagesPresent>
-			<lams:Alert type="warning" id="profileRestrictions" close="false">
-				<html:errors />
-			</lams:Alert>
-		</logic:messagesPresent>
+		 <c:set var="errorKey" value="GLOBAL" /> 
+		 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+		     <lams:Alert id="error" type="danger" close="false"> 
+		         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+		             <c:out value="${error}" /><br /> 
+		         </c:forEach> 
+		     </lams:Alert> 
+		</c:if>
 
 		<c:set var="profileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%></c:set>
 		<c:set var="partialProfileEditEnabled"><%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%></c:set>
@@ -81,121 +82,120 @@
 
 								<div class="form-group">
 									<span class="lead"><label><fmt:message
-												key="label.username" /></label>: <bean:write name="UserForm"
-											property="login" /></span>
+												key="label.username" /></label>: ${UserForm.login}</span>
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.title" />:</label>
-									<html:text property="title" size="32" maxlength="32"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="title" size="32" maxlength="32"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.first_name" /> *:</label>
-									<html:text property="firstName" size="50" maxlength="128"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="firstName" size="50" maxlength="128"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.last_name" /> *:</label>
-									<html:text property="lastName" size="50" maxlength="128"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="lastName" size="50" maxlength="128"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 								<c:if test="${!profileEditEnabled}">
-									<html:hidden property="firstName" />
-									<html:hidden property="lastName" />
+									<form:hidden path="firstName" />
+									<form:hidden path="lastName" />
 								</c:if>
 								<div class="form-group">
 									<label><fmt:message key="label.email" /> *:</label>
-									<html:text property="email" size="50" maxlength="128"
+									<form:input path="email" size="50" maxlength="128"
 										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
-										styleClass="form-control" />
+										cssClass="form-control" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.address_line_1" />:</label>
-									<html:text property="addressLine1" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="addressLine1" size="50" maxlength="64"
+										disabled="${!profileEditEnabled}" csseClass="form-control" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.address_line_2" />:</label>
-									<html:text property="addressLine2" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="addressLine2" size="50" maxlength="64"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.address_line_3" />:</label>
-									<html:text property="addressLine3" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="addressLine3" size="50" maxlength="64"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.city" />:</label>
-									<html:text property="city" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="city" size="50" maxlength="64"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.state" />:</label>
-									<html:text property="state" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="state" size="50" maxlength="64"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.postcode" />:</label>
-									<html:text property="postcode" size="10" maxlength="10"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="postcode" size="10" maxlength="10"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.country" />:</label>
-									<html:text property="country" size="50" maxlength="64"
-										disabled="${!profileEditEnabled}" styleClass="form-control" />
+									<form:input path="country" size="50" maxlength="64"
+										disabled="${!profileEditEnabled}" cssClass="form-control" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.day_phone" />:</label>
-									<html:text property="dayPhone" size="50" maxlength="64"
+									<form:input path="dayPhone" size="50" maxlength="64"
 										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
-										styleClass="form-control" />
+										cssClass="form-control" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.evening_phone" />:</label>
-									<html:text property="eveningPhone" size="50" maxlength="64"
+									<form:input path="eveningPhone" size="50" maxlength="64"
 										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
-										styleClass="form-control" />
+										cssClass="form-control" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.mobile_phone" />:</label>
-									<html:text property="mobilePhone" size="50" maxlength="64"
+									<form:input path="mobilePhone" size="50" maxlength="64"
 										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
-										styleClass="form-control" />
+										cssClass="form-control" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.fax" />:</label>
-									<html:text property="fax" size="50" maxlength="64"
+									<form:input path="fax" size="50" maxlength="64"
 										disabled="${!profileEditEnabled and !partialProfileEditEnabled}"
-										styleClass="form-control" />
+										cssClass="form-control" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.language" />:</label>
-									<html:select property="localeId"
+									<form:select path="localeId"
 										disabled="${!profileEditEnabled}" styleClass="form-control">
 										<c:forEach items="${locales}" var="locale">
-											<html:option value="${locale.localeId}">
+											<form:option value="${locale.localeId}">
 												<c:out value="${locale.description}" />
-											</html:option>
+											</form:option>
 										</c:forEach>
-									</html:select>
+									</form:select>
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.timezone.title" />:</label>
-									<html:select property="timeZone" disabled="${!profileEditEnabled}" styleClass="form-control">
+									<form:select path="timeZone" disabled="${!profileEditEnabled}" cssClass="form-control">
 										<c:forEach items="${timezoneDtos}" var="timezoneDto">
-											<html:option value="${timezoneDto.timeZoneId}">
+											<form:option value="${timezoneDto.timeZoneId}">
 												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-											</html:option>
+											</form:option>
 										</c:forEach>
-									</html:select>
+									</form:select>
 								</div>
 
 								<div class="form-group">
@@ -204,194 +204,193 @@
 			 But for simplicity of coding, we keep it as a negative value - "should the tutorials be disabled?"
 			 This is the reason to mix true/false and yes/no answers.
 		-->
-									<html:select property="tutorialsDisabled"
-										disabled="${!profileEditEnabled}" styleClass="form-control">
-										<html:option value="false">
+									<form:select path="tutorialsDisabled"
+										disabled="${!profileEditEnabled}" csslass="form-control">
+										<form:option value="false">
 											<fmt:message key="label.yes" />
-										</html:option>
-										<html:option value="true">
+										</form:option>
+										<form:option value="true">
 											<fmt:message key="label.no" />
-										</html:option>
-									</html:select>
+										</form:option>
+									</form:select>
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.theme" />:</label>
-									<html:select property="userTheme" disabled="${!profileEditEnabled}" styleClass="form-control">
+									<form:select path="userTheme" disabled="${!profileEditEnabled}" cssClass="form-control">
 										<c:forEach items="${themes}" var="theme">
-											<html:option value="${theme.themeId}">${theme.name}</html:option>
+											<form:option value="${theme.themeId}">${theme.name}</form:option>
 										</c:forEach>
-									</html:select>
+									</form:select>
 								</div>
 								
 							</c:if>
 							<br />
 
 							<c:if test="${authenticationMethodId != dbId}">
-								<html:hidden property="title" />
-								<html:hidden property="firstName" />
-								<html:hidden property="lastName" />
-								<html:hidden property="email" />
-								<html:hidden property="addressLine1" />
-								<html:hidden property="addressLine2" />
-								<html:hidden property="addressLine3" />
-								<html:hidden property="city" />
-								<html:hidden property="state" />
-								<html:hidden property="postcode" />
-								<html:hidden property="country" />
-								<html:hidden property="dayPhone" />
-								<html:hidden property="eveningPhone" />
-								<html:hidden property="mobilePhone" />
-								<html:hidden property="fax" />
+								<form:hidden path="title" />
+								<form:hidden path="firstName" />
+								<form:hidden path="lastName" />
+								<form:hidden path="email" />
+								<form:hidden path="addressLine1" />
+								<form:hidden path="addressLine2" />
+								<form:hidden path="addressLine3" />
+								<form:hidden path="city" />
+								<form:hidden path="state" />
+								<form:hidden path="postcode" />
+								<form:hidden path="country" />
+								<form:hidden path="dayPhone" />
+								<form:hidden path="eveningPhone" />
+								<form:hidden path="mobilePhone" />
+								<form:hidden path="fax" />
 
 								<div class="form-group">
 									<label><fmt:message key="label.username" /></label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="login" />>
+										value="${UserForm.login}">
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.username" /></label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="login" />>
+										value="${UserForm.login}" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.title" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="title" />>
+										value="${UserForm.title}"/>
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.first_name" /> *:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="firstName" />>
+										value="${UserForm.firstName}"/>
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.last_name" /> *:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="lastName" />>
+										value="${UserForm.lastName}"/>
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.email" /> *:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="email" />>
+										value="${UserForm.email}"/>
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.address_line_1" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="addressLine1" />>
+										value="${UserForm.addressLine1}"/>
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.address_line_2" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="addressLine2" />>
+										value="${UserForm.addressLine2}" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.address_line_3" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="addressLine3" />>
+										value="${UserForm.addressLine3}" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.city" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="city" />>
+										value="${UserForm.city}" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.state" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="state" />>
+										value="${UserForm.state}" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.postcode" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="postcode" />>
+										value="${UserForm.postcode}" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.country" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="country" />>
+										value="${UserForm.country}" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.day_phone" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="dayPhone" />>
+										value="${UserForm.dayPhone}" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.evening_phone" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="eveningPhone" />>
+										value="${UserForm.eveningPhone}" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.mobile_phone" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="mobilePhone" />>
+										value="${UserForm.mobilePhone}" />
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.fax" />:</label> <input
 										type="text" class="form-control"
-										value=<bean:write name="UserForm" property="fax" />>
+										value="${UserForm.fax}" />
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.theme" />:</label>
-									<html:select property="userTheme"
-										disabled="${!profileEditEnabled}" styleClass="form-control">
+									<form:select path="userTheme"
+										disabled="${!profileEditEnabled}" cssClass="form-control">
 										<c:forEach items="${themes}" var="theme">
-											<html:option value="${theme.themeId}">${theme.name}</html:option>
+											<form:option value="${theme.themeId}">${theme.name}</form:option>
 										</c:forEach>
-									</html:select>
+									</form:select>
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.language" />:</label>
-									<html:select property="localeId"
-										disabled="${!profileEditEnabled}" styleClass="form-control">
+									<form:select path="localeId"
+										disabled="${!profileEditEnabled}" cssClass="form-control">
 										<c:forEach items="${locales}" var="locale">
-											<html:option value="${locale.localeId}">
+											<form:option value="${locale.localeId}">
 												<c:out value="${locale.description}" />
-											</html:option>
+											</form:option>
 										</c:forEach>
-									</html:select>
+									</form:select>
 								</div>
 
 								<div class="form-group">
 									<label><fmt:message key="label.timezone.title" />:</label>
-									<html:select property="timeZone" disabled="${!profileEditEnabled}" styleClass="form-control">
+									<form:select path="timeZone" disabled="${!profileEditEnabled}" cssClass="form-control">
 										<c:forEach items="${timezoneDtos}" var="timezoneDto">
-											<html:option value="${timezoneDto.timeZoneId}">
+											<form:option value="${timezoneDto.timeZoneId}">
 												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
-											</html:option>
+											</form:option>
 										</c:forEach>
-									</html:select>
+									</form:select>
 								</div>
 								<div class="form-group">
 									<label><fmt:message key="label.timezone.title" />:</label>
 									<c:set var="timeZone">
 										<input type="text" class="form-control"
-											value=<bean:write name="UserForm" property="timeZone" />>
+											value="${UserForm.timeZone}" />
 									</c:set>
 									${timeZone}
 								</div>
 								<div class="form-group">
-									<label><fmt:message key="label.tutorial.enabled" />:<bean:write
-											name="UserForm" property="tutorialsDisabled" /></label>
+									<label><fmt:message key="label.tutorial.enabled" />:${UserForm.tutorialsDisabled}</label>
 									<!-- For users' comfort we write it as a positive sentece - "should the tutorials be enabled"?
 			 But for simplicity of coding, we keep it as a negative value - "should the tutorials be disabled?"
 			 This is the reason to mix true/false and yes/no answers.
 		-->
-									<html:select property="tutorialsDisabled"
-										disabled="${!profileEditEnabled}" styleClass="form-control">
-										<html:option value="false">
+									<form:select path="tutorialsDisabled"
+										disabled="${!profileEditEnabled}" cssClass="form-control">
+										<form:option value="false">
 											<fmt:message key="label.yes" />
-										</html:option>
-										<html:option value="true">
+										</form:option>
+										<form:option value="true">
 											<fmt:message key="label.no" />
-										</html:option>
-									</html:select>
+										</form:option>
+									</form:select>
 								</div>
 
 							</c:if>
@@ -400,17 +399,16 @@
 					</div>
 				</div>
 			</div>
-	</html:form>
+	</form:form>
 	<div class="form-group" align="right">
-		<html:cancel styleClass="btn btn-sm btn-default voffset5">
+		<a href="<lams:LAMSURL />profile.jsp"   class="btn btn-sm btn-default voffset5" ></a>
 			<fmt:message key="button.cancel" />
-		</html:cancel>
 		&nbsp;&nbsp;
 		<c:if test="${profileEditEnabled or partialProfileEditEnabled}">
-			<html:button styleClass="btn btn-sm btn-primary voffset5"
-				property="submit" onclick="submitMessage()">
+			<button class="btn btn-sm btn-primary voffset5" type="button"
+				name="submit" onclick="submitMessage()"> 
 				<fmt:message key="button.save" />
-			</html:button>
+			</button>
 		</c:if>
 	</div>
 	</div>
Index: lams_central/web/emailuser.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/emailuser.jsp	(.../emailuser.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -91,12 +91,13 @@
 			<div class="panel-heading">
 				<fmt:message key="email.compose.mail" />
 			</div>
-			<c:if test="${errorsPresent}">
-				<lams:Alert id="errorArea" type="warning">
-					<html:messages id="error">
-						<c:out value="${error}" escapeXml="false" />
-					</html:messages>
-				</lams:Alert>
+			 <c:set var="errorKey" value="GLOBAL" /> 
+			 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+			    <lams:Alert id="errorArea" type="warning">
+			         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+			             <c:out value="${error}" /><br /> 
+			         </c:forEach> 
+			     </lams:Alert> 
 			</c:if>
 			<div class="panel-body">
 				<form id="emailUserForm"
Index: lams_central/web/errorContent.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/errorContent.jsp	(.../errorContent.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/errorContent.jsp	(.../errorContent.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -8,10 +8,10 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<html:base/>
+	<base href="<lams:WebAppURL />">
 	<title><fmt:message key="heading.general.error" /></title>
 	<lams:css/>
-	<script language="JavaScript" type="text/JavaScript" src="<html:rewrite page='/includes/javascript/changeStyle.js'/>"></script>
+	<script language="JavaScript" type="text/JavaScript" src="<lams:WebAppURL />includes/javascript/changeStyle.js"></script>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
Index: lams_central/web/findUserLessons.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/findUserLessons.jsp	(.../findUserLessons.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/findUserLessons.jsp	(.../findUserLessons.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -32,11 +32,11 @@
 	<script type="text/javascript">
 		$(document).ready(function(){
 			$("#query").focus().autocomplete({
-				'source' : "${lams}/findUserLessons.do?courseID=${courseID}&dispatch=autocomplete",
+				'source' : "${lams}/findUserLessons/autocomplete.do?courseID=${courseID}",
 				'delay'  : 700,
 				'select' : function(event, ui){
 					// display results for an exact user ID
-					window.location.href = "${lams}/findUserLessons.do?courseID=${courseID}&dispatch=getResults&userID="
+					window.location.href = "${lams}/findUserLessons/getResults.do?courseID=${courseID}&userID="
 											+ ui.item.value; 
 			    }
 			});
@@ -55,8 +55,7 @@
 			<fmt:message key="lessonsearch.instuctions" />
 		</div>
 
-		<form action="${lams}/findUserLessons.do">
-			<input type="hidden" name="dispatch" value="getResults" />
+		<form action="${lams}/findUserLessons/getResults.do">
 			<input type="text" id="query" name="query" />
 			<input type="hidden" name="courseID" value="${courseID}" />
 			<button type="submit" class="btn btn-sm btn-primary">
Index: lams_central/web/forgotPassword.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -27,15 +27,15 @@
 
 		function validateForm() {
 			if (document.forgotForm.selectType[0].checked) {
-				var login = document.forgotForm.login.value;
+				var login = document.forms.forgotForm.login.value;
 				if (login == null || login == "") {
 					alert("<fmt:message key="error.forgot.password.username" />");
 					return false;
 				} else {
-					document.forgotForm.submit();
+					document.forms.forgotForm.submit();
 				}
-			} else if (document.forgotForm.selectType[1].checked) {
-				var email = document.forgotForm.email.value;
+			} else if (document.forms.forgotForm.selectType[1].checked) {
+				var email = document.forms.forgotForm.email.value;
 				//var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
 				var filter = /^(.)+\@(.)+\.(.)+/;
 
@@ -46,18 +46,18 @@
 					alert("<fmt:message key="error.valid.email.required" />");
 					return false;
 				} else {
-					document.forgotForm.submit();
+					document.forms.forgotForm.submit();
 				}
 			}
 		}
 
 		function radioSelected() {
-			if (document.forgotForm.selectType[0].checked) {
-				document.forgotForm.login.disabled = false;
-				document.forgotForm.email.disabled = true;
-			} else if (document.forgotForm.selectType[1].checked) {
-				document.forgotForm.login.disabled = true;
-				document.forgotForm.email.disabled = false;
+			if (document.forms.forgotForm.selectType[0].checked) {
+				document.forms.forgotForm.login.disabled = false;
+				document.forms.forgotForm.email.disabled = true;
+			} else if (document.forms.forgotForm.selectType[1].checked) {
+				document.forms.forgotForm.login.disabled = true;
+				document.forms.forgotForm.email.disabled = false;
 			}
 		}
 
@@ -133,15 +133,15 @@
 						</div>
 
 						<div class="form-group">
-							<html:button property="cancel"
-								styleClass="btn btn-default roffset10"
+							<button name="cancel"
+								class="btn btn-default roffset10" type="button"
 								onclick="javascript:toHome();">
 								<fmt:message key="button.cancel" />
-							</html:button>
-							<html:button property="ok" styleClass="btn btn-primary"
+							</button>
+							<button name="ok" class="btn btn-primary" type="button"
 								onclick="javascript:validateForm();">
 								<fmt:message key="label.ok" />
-							</html:button>
+							</button>
 						</div>
 
 					</div>
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -155,9 +155,9 @@
 					name="confirmNewPassword" maxlength="25" />
 			</div>
 			<div class="form-group" align="right">
-				<html:submit styleClass="btn btn-sm btn-primary voffset5">
+				<button class="btn btn-sm btn-primary voffset5">
 					<fmt:message key="button.save" />
-				</html:submit>
+				</button>
 			</div>
 
 		</form>
Index: lams_central/web/forgotPasswordProc.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/forgotPasswordProc.jsp	(.../forgotPasswordProc.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -75,9 +75,9 @@
 
 		</lams:Alert>
 
-		<html:button property="cancel" styleClass="btn btn-primary pull-right voffset10" onclick="javascript:toHome();">
+		<button type="button" name="cancel" class="btn btn-primary pull-right voffset10" onclick="javascript:toHome();">
 			<fmt:message key="label.ok" />
-		</html:button>
+		</button>
 
 
 	</lams:Page>
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1310,9 +1310,8 @@
 			return;
 		}
 		$.ajax({
-			url : LAMS_URL + 'authoring/author.do',
+			url : LAMS_URL + 'authoring/author/getToolOutputDefinitions.do',
 			data : {
-				'method' : 'getToolOutputDefinitions',
 				'toolContentID' : activity.toolContentID 
 								|| layout.toolMetadata[activity.learningLibraryID].defaultToolContentID
 			},
Index: lams_central/web/includes/javascript/dialog.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/dialog.js	(.../dialog.js)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -404,7 +404,7 @@
 		'open' : function() {
 			var dialog = $(this);
 			// load contents after opening the dialog
-			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?method=portrait&isReturnButtonHidden=true');
+			$('iframe', dialog).attr('src', LAMS_URL + 'index/portrait.do?isReturnButtonHidden=true');
 			
 			// in case of mobile devices allow iframe scrolling
 			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -r2bb977730eb38127921bd886690e679bfeab57a1 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 2bb977730eb38127921bd886690e679bfeab57a1)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -30,7 +30,7 @@
             cssPageDisplay: '.pagedisplay',
             cssPageSize: '.pagesize',
             cssDisabled: 'disabled',
-            ajaxUrl : LAMS_URL + "/index.do?dispatch=getOrgs&page={page}&size={size}&{sortList:column}&{filterList:fcol}",
+            ajaxUrl : LAMS_URL + "/index/getOrgs.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}",
 			ajaxProcessing: function (data, table) {
 		    	if (data && data.hasOwnProperty('rows')) {
 		    		var rows = [],
@@ -182,7 +182,7 @@
 		'open' : function() {
 			var dialog = $(this);
 			// load contents after opening the dialog
-			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?method=profile');
+			$('iframe', dialog).attr('src', LAMS_URL + 'index/profile.do');
 			
 			// in case of mobile devices allow iframe scrolling
 			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
Index: lams_central/web/indexLessonConditions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -50,13 +50,14 @@
     
 <body class="stripes">
 <lams:Page type="admin" title="">
-<logic:messagesPresent> 
-	<lams:Alert id="errors" type="danger" close="false">
-		<html:messages id="error">
-			<c:out value="${error}" escapeXml="false"/><br/>
-		</html:messages>
-   </lams:Alert>
-</logic:messagesPresent>
+ <c:set var="errorKey" value="GLOBAL" /> 
+ <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+     <lams:Alert id="error" type="danger" close="false"> 
+         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+             <c:out value="${error}" /><br /> 
+         </c:forEach> 
+     </lams:Alert> 
+</c:if>
 
 	<!-- Preceding lessons setup -->
 		<p class="lead">
Index: lams_central/web/lessonIntro.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -4,7 +4,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-function" prefix="fn"%>
 <c:set var="lams" ><lams:LAMSURL/></c:set>
 
@@ -91,9 +91,9 @@
 		</c:if>
 			
 		<div class="voffset10 pull-right">
-			<html:link href="${lams}home.do?method=learner&lessonID=${lesson.lessonId}&isLessonIntroWatched=true" styleClass="btn btn-primary na">
+			<a href="${lams}home/learner.do?lessonID=${lesson.lessonId}&isLessonIntroWatched=true" class="btn btn-primary na">
 				<span class="nextActivity"><fmt:message key="label.start.lesson" /></span>
-			</html:link>
+			</a>
 		</div>
 	
 		<div id="footer"></div>
Index: lams_central/web/lessons.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,10 +1,8 @@
 <!DOCTYPE html>
 
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
@@ -78,7 +76,7 @@
 					<div align="center">
 						<input class="btn btn-sm btn-default offset5" type="button"
 							value="<fmt:message key="label.return.to.myprofile" />"
-							onclick="javascript:document.location='index.do?method=profile'" />
+							onclick="javascript:document.location='index/profile.do'" />
 					</div>
 
 				</div>
Index: lams_central/web/loginTwoFactorAuth.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/loginTwoFactorAuth.jsp	(.../loginTwoFactorAuth.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/loginTwoFactorAuth.jsp	(.../loginTwoFactorAuth.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -80,7 +80,7 @@
 					</div>
 				</c:if>
 
-				<form action="/lams/j_security_check" method="POST"  role="form" class="form-horizontal" name="loginForm" id="loginForm">
+				<form action="/lams/j_security_check.do" method="POST"  role="form" class="form-horizontal" name="loginForm" id="loginForm">
 					<input type="hidden" name="j_username" value="${login}" /> 
 					<input type="hidden" name="j_password" value="${password}" /> 
 					<input type="hidden" name="redirectURL" value='<c:out value="${param.redirectURL}" escapeXml="true" />' />
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -5,7 +5,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-function" prefix="fn"%>
 <c:set var="lams" ><lams:LAMSURL/></c:set>
 
@@ -124,7 +124,7 @@
 
 	function openPreview() {
     	var ldId = document.getElementsByName("ldId")[0].value;
-        var title = document.lessonForm.title.value;
+        var title = document.forms.lessonForm.title.value;
 		
 		// initialize, create and enter the preview lesson
 		$.ajax({
@@ -172,7 +172,7 @@
      // Check that a title has been supplied
 	function confirmSubmit() {
          
-		var title = rettrim(document.lessonForm.title.value);
+		var title = rettrim(document.forms.lessonForm.title.value);
 		if ((title == "")||(title == null)) {
 			alert("<fmt:message key='authoring.fla.save.sequence.title.prompt' />");
 			return false;
Index: lams_central/web/lti/learnerMonitor.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/lti/learnerMonitor.jsp	(.../learnerMonitor.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/lti/learnerMonitor.jsp	(.../learnerMonitor.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -5,7 +5,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-core" prefix="c" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-function" prefix="fn"%>
 <c:set var="lams" ><lams:LAMSURL/></c:set>
 
Index: lams_central/web/msgContent.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/msgContent.jsp	(.../msgContent.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/msgContent.jsp	(.../msgContent.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -8,10 +8,10 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<html:base/>
+	<base src="<lams:WebAppURL />"/>
 	<title><fmt:message key ="heading.general.error" /></title>
 	<lams:css/>
-	<script language="JavaScript" type="text/JavaScript" src="<html:rewrite page='/includes/javascript/changeStyle.js'/>"></script>
+	<script language="JavaScript" type="text/JavaScript" src="<lams:WebAppURL />includes/javascript/changeStyle.js"></script>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
Index: lams_central/web/orgGroup.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -2,7 +2,7 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
@@ -234,17 +234,17 @@
 				</button>
 			</div>
 			<div class="voffset5">
-				<html:form action="groupingUpload.do?method=importLearnersForGrouping" enctype="multipart/form-data" styleId="uploadForm">
-				<html:hidden property="activityID" styleId="activityID" value="${param.activityID}"/>
-				<html:hidden property="lessonID" styleId="lessonID" value="${lessonID}"/>
-				<%-- <html:hidden property="organisationID" styleId="organisationID"/> Value is set in Javascript as it comes in the JSON --%>
-				<%-- <thml:hidden property="groupingId" styleId="groupingId" value="${groupingId}"/> Value is set in Javascript as only used for some modes  --%>
+				<form:form action="groupingUpload/importLearnersForGrouping.do" enctype="multipart/form-data" modelAttribute="uploadForm" id="uploadForm">
+				<form:hidden path="activityID" id="activityID" value="${param.activityID}"/>
+				<form:hidden path="lessonID" id="lessonID" value="${lessonID}"/>
+				<%-- <form:hidden path="organisationID" id="organisationID"/> Value is set in Javascript as it comes in the JSON --%>
+				<%-- <form:hidden path="groupingId" id="groupingId" value="${groupingId}"/> Value is set in Javascript as only used for some modes  --%>
 				<button id="import" class="pull-right btn btn-sm btn-primary btn-disable-on-downupload" onClick="javascript:importGroupsFromSpreadsheet();return false;">
 					<fmt:message key="button.import" />
 				</button>
 				<lams:FileUpload fileFieldname="groupUploadFile" fileInputMessageKey="label.upload.group.spreadsheet"
 					uploadInfoMessageKey="-" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/>
-				</html:form>
+				</form:form>
 			</div>
 			<lams:WaitingSpinner id="attachmentArea_Busy"/>
 			</div>
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -101,16 +101,31 @@
 		<div class="row vertical-center-row">
 			<div class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
 				<div class="panel voffset20">
-					<logic:messagesPresent message="true">
-						<p class="warning">
-							<html:messages message="true" id="errMsg">
-								<bean:write name="errMsg" />
-								<br>
-							</html:messages>
-							
-							
-						</p>
-						</logic:messagesPresent>
+						 <c:set var="errorKey" value="GLOBAL" /> 
+						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+						 	<p class="warning">
+							         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+							             <c:out value="${error}" /><br /> 
+							         </c:forEach> 
+						     </p>
+						</c:if>
+						<c:set var="errorKey" value="password" /> 
+						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+						 	<p class="warning">
+							         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+							             <c:out value="${error}" /><br /> 
+							         </c:forEach> 
+						     </p>
+						</c:if>
+						<c:set var="errorKey" value="oldPassword" /> 
+						 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+						 	<p class="warning">
+							         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+							             <c:out value="${error}" /><br /> 
+							         </c:forEach> 
+						     </p>
+						</c:if>
+						
 
 					<div class="panel-body">
 					<input type="hidden" name="redirectURL" value="${param.redirectURL}" />
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,10 +1,8 @@
 <!DOCTYPE html>
 
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -135,14 +135,14 @@
 		<div class="currentPortrait text-center" style="margin:10px">
 			<fmt:message key="label.portrait.current" />:<br/>
 	
-			<logic:notEqual name="PortraitActionForm" property="portraitUuid" value="0">
-				<img class="img-thumbnail" src="/lams/download/?uuid=<bean:write name="PortraitActionForm" 
-						property="portraitUuid" />&version=2&preferDownload=false" />
-			</logic:notEqual>
-	
-			<logic:equal name="PortraitActionForm" property="portraitUuid"	value="0">
-				<em><fmt:message key="msg.portrait.none" /></em>
-			</logic:equal>
+			<c:choose>
+				<c:when test="${PortraitActionForm.portraitUuid == 0}">
+					<em><fmt:message key="msg.portrait.none" /></em>
+				</c:when>
+				<c:otherwise>
+				<img class="img-thumbnail" src="/lams/download/?uuid="${PortraitActionForm.portraitUuid}"&version=2&preferDownload=false" />
+				</c:otherwise>
+			</c:choose>
 		</div>
 
 		<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -2,9 +2,7 @@
 
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
 	import="org.lamsfoundation.lams.util.Configuration"
@@ -61,7 +59,7 @@
 					<!-- Split button -->
 					<div class="col-xs-12 text-center">
 						<a class="btn btn-sm btn-default offset5"
-							href="index.do?method=editprofile" role="button"><i
+							href="index/editprofile.do" role="button"><i
 							class="fa fa-fw fa-pencil"></i> <span class="hidden-xs"><fmt:message
 									key="title.profile.edit.screen" /></span></i>
 						</a>&nbsp;&nbsp;
@@ -73,7 +71,7 @@
 						<c:if test="${authenticationMethodId eq dbId}">
 
 							<a class="btn btn-sm btn-default offset5"
-								href="index.do?method=password&redirectURL=index.do%3Fstate%3Dactive%26method%3Dprofile" role="button">
+								href="index/password.do?redirectURL=index.do%3Fstate%3Dactive%26method%3Dprofile" role="button">
 									<i class="fa fa-fw fa-lock"></i> 
 										<span class="hidden-xs"><fmt:message
 											key="title.password.change.screen" />
@@ -82,14 +80,14 @@
 							</a>
 						</c:if>
 						<a class="btn btn-sm btn-default offset5"
-							href="index.do?method=portrait" role="button">
+							href="index/portrait.do" role="button">
 							<i class="fa fa-fw fa-camera"></i> <span class="hidden-xs"><fmt:message
 									key="title.portrait.change.screen" /></span></i>
 						</a>&nbsp;&nbsp;
 
 						<c:if test="${showAllMyLessonLink}">
 							<a class="btn btn-sm btn-default offset5"
-								href="index.do?method=lessons" role="button">
+								href="index/lessons.do" role="button">
 								<i class="fa fa-fw fa-book"></i> <span class="hidden-xs"><fmt:message
 										key="title.all.my.lessons" /></span>
 								</i>
Index: lams_central/web/questions/questionFile.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/questions/questionFile.jsp	(.../questionFile.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" %>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %>
Index: lams_central/web/signup/loginTab.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/signup/loginTab.jsp	(.../loginTab.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/signup/loginTab.jsp	(.../loginTab.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -1,6 +1,5 @@
 <body>
 	<form:form id="SignupForm" modelAttribute="SignupForm" action="/lams/signup/signup.do" method="post" autocomplete="off" >
- 		<c:set var="org.apache.struts.taglib.html.BEAN"  value="${SignupForm}" />
  		<form:hidden path="method" value="login" />
 		<form:hidden path="submitted" value="1" />
 		<form:hidden path="context" value="${signupOrganisation.context}" />
@@ -42,7 +41,14 @@
 								 <label for="courseKeyTab2"><fmt:message key="login.course.key" /></label>:
 								<form:input path="courseKeyTab2" size="40" maxlength="255"
 									cssClass="form-control" />
-								<html:errors property="courseKeyTab2" />
+								 <c:set var="errorKey" value="courseKeyTab2" /> 
+								 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+								     <lams:Alert id="error" type="danger" close="false"> 
+								         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+								             <c:out value="${error}" /><br /> 
+								         </c:forEach> 
+								     </lams:Alert> 
+								</c:if>
 							</div>
 							<div class="form-group" align="right">
 								<button class="btn btn-sm btn-default voffset5">
Index: lams_central/web/signup/singupTab.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/signup/singupTab.jsp	(.../singupTab.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/signup/singupTab.jsp	(.../singupTab.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -138,13 +138,12 @@
 </script>
 <div>
 
-	<form id="SignupForm" name="SignupForm" method="post" action="/lams/signup/signup.do" novalidate="novalidate"  autocomplete="off">
-		<c:set var="org.apache.struts.taglib.html.BEAN"  value="${SignupForm}" />
+	<form:form modelAttribute="SignupForm" id="SignupForm" name="SignupForm" method="post" action="/lams/signup/signup.do" novalidate="novalidate"  autocomplete="off">
 	
-		<html:hidden property="method" value="register" />
-		<html:hidden property="submitted" value="1" />
-		<html:hidden property="context" value="${signupOrganisation.context}" />
-		<html:hidden property="selectedTab" value="0" />
+		<form:hidden path="method" value="register" />
+		<form:hidden path="submitted" value="1" />
+		<form:hidden path="context" value="${signupOrganisation.context}" />
+		<form:hidden path="selectedTab" value="0" />
 
 		<div class="container">
 			<div class="row vertical-center-row">
@@ -155,9 +154,16 @@
 
 							<div class="form-group">
 								<label for="username"><fmt:message key="signup.username" /></label>:
-								<html:text property="username" size="40" maxlength="255"
-									styleClass="form-control" />
-								<html:errors property="username" />
+								<form:input path="username" size="40" maxlength="255"
+									cssClass="form-control" />
+								 <c:set var="errorKey" value="username" /> 
+								 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+								     <lams:Alert id="error" type="danger" close="false"> 
+								         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+								             <c:out value="${error}" /><br /> 
+								         </c:forEach> 
+								     </lams:Alert> 
+								</c:if>
 								<span style="display: none;'" class="msg error"> <fmt:message
 										key="error.username.invalid.characters" /></span>
 							</div>
@@ -193,53 +199,81 @@
 							<div class="form-group">
 								<label for="password"><fmt:message key="signup.password" /></label>:
 
-								<html:password property="password" size="40"
-									styleClass="form-control" maxlength="25" />
-								<html:errors property="password" />
+								<form:password path="password" size="40"
+									cssClass="form-control" maxlength="25" />
+								 <c:set var="errorKey" value="password" /> 
+								 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+								     <lams:Alert id="error" type="danger" close="false"> 
+								         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+								             <c:out value="${error}" /><br /> 
+								         </c:forEach> 
+								     </lams:Alert> 
+								</c:if>
 							</div>
 
 							<div class="form-group">
 								<label for="confirmPassword"><fmt:message key="signup.confirm.password" /></label>:
 
-								<html:password property="confirmPassword" size="40"
-									maxlength="25" styleClass="form-control" />
+								<form:password path="confirmPassword" size="40"
+									maxlength="25" cssClass="form-control" />
 								<span style="display: none;'" class="confirmPassword error"><fmt:message
 										key="error.passwords.unequal" /></span>
 							</div>
 							<div class="form-group">
 								<label for="firstName"><fmt:message key="signup.first.name" /></label>:
 
-								<html:text property="firstName" size="40" maxlength="255"
-									styleClass="form-control" />
-								<html:errors property="firstName" />
+								<form:input path="firstName" size="40" maxlength="255"
+									cssClass="form-control" />
+								 <c:set var="errorKey" value="firstName" /> 
+								 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+								     <lams:Alert id="error" type="danger" close="false"> 
+								         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+								             <c:out value="${error}" /><br /> 
+								         </c:forEach> 
+								     </lams:Alert> 
+								</c:if>
 								<span style="display: none;'" class="first error"><fmt:message
 										key="error.firstname.invalid.characters" /></span>
 							</div>
 
 							<div class="form-group">
 								<label for="lastName"><fmt:message key="signup.last.name" /></label>:
 
-								<html:text property="lastName" size="40" maxlength="255"
-									styleClass="form-control" />
-								<html:errors property="lastName" />
+								<form:input path="lastName" size="40" maxlength="255"
+									cssClass="form-control" />
+								 <c:set var="errorKey" value="lastName" /> 
+									 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+									     <lams:Alert id="error" type="danger" close="false"> 
+									         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+									             <c:out value="${error}" /><br /> 
+									         </c:forEach> 
+									     </lams:Alert> 
+									</c:if>
 								<span style="display: none;'" class="last error"><fmt:message
 										key="error.lastname.invalid.characters" /></span>
 							</div>
 							<div class="form-group">
 								<label for="email"><fmt:message key="signup.email" /></label>:
 
-								<html:text property="email" size="40" maxlength="255"
-									styleClass="form-control" />
-								<html:errors property="email" />
+								<form:input path="email" size="40" maxlength="255"
+									cssClass="form-control" />
+								 <c:set var="errorKey" value="email" /> 
+								 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+								     <lams:Alert id="error" type="danger" close="false"> 
+								         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+								             <c:out value="${error}" /><br /> 
+								         </c:forEach> 
+								     </lams:Alert> 
+								</c:if>
 								<span style="display: none;'" class="email error"><fmt:message
 										key="error.email.invalid.format" /></span>
 							</div>
 
 							<div class="form-group">
 								<label for="confirmEmail"><fmt:message key="signup.confirm.email" /></label>:
 
-								<html:text property="confirmEmail" size="40" maxlength="255"
-									styleClass="form-control" />
+								<form:input path="confirmEmail" size="40" maxlength="255"
+									cssClass="form-control" />
 								<span style="display: none;'" class="confirmEmail error"><fmt:message
 										key="error.emails.unequal" /></span>
 							</div>
@@ -248,15 +282,22 @@
 							<div class="form-group">
 								<label for="courseKey"><fmt:message key="signup.course.key" /></label>:
 
-								<html:text property="courseKey" size="40" maxlength="255"
-									styleClass="form-control" />
-								<html:errors property="courseKey" />
+								<form:input path="courseKey" size="40" maxlength="255"
+									cssClass="form-control" />
+								 <c:set var="errorKey" value="courseKey" /> 
+									 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
+									     <lams:Alert id="error" type="danger" close="false"> 
+									         <c:forEach var="error" items="${errorMap[errorKey]}"> 
+									             <c:out value="${error}" /><br /> 
+									         </c:forEach> 
+									     </lams:Alert> 
+									</c:if>
 							</div>
 
 							<div class="form-group" align="right">
-								<html:submit styleClass="btn btn-sm btn-default voffset5">
+								<button styleClass="btn btn-sm btn-default voffset5">
 									<fmt:message key="login.submit" />
-								</html:submit>
+								</</button>
 							</div>
 						</div>
 					</div>
Index: lams_central/web/signup/successfulSignup.jsp
===================================================================
diff -u -r792f30e164500b758d9eeac2dcf19853be4dfd9f -r5943e05705f7614c7c1c29d13ce50deacdc46cc0
--- lams_central/web/signup/successfulSignup.jsp	(.../successfulSignup.jsp)	(revision 792f30e164500b758d9eeac2dcf19853be4dfd9f)
+++ lams_central/web/signup/successfulSignup.jsp	(.../successfulSignup.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
@@ -9,10 +9,10 @@
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<html:base/>
+	<base href="<lams:WebAppURL />"/>
 	<title><fmt:message key="title.lams.signup" /></title>
 	<lams:css/>
-	<script language="JavaScript" type="text/JavaScript" src="<html:rewrite page='/includes/javascript/changeStyle.js'/>"></script>
+	<script language="JavaScript" type="text/JavaScript" src="<lams:WebAppURL />includes/javascript/changeStyle.js"></script>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
 	<script language="JavaScript" type="text/javascript" src="includes/javascript/openUrls.js"></script>
 	<link rel="icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />