Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r0098ee98c13ace879187e62498b19cada9db2fef
Binary files differ
Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -r2bb977730eb38127921bd886690e679bfeab57a1 -r0098ee98c13ace879187e62498b19cada9db2fef
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
===================================================================
diff -u -ra2b07e1644d6345cd1f6cae619ae9087f25a60d4 -r0098ee98c13ace879187e62498b19cada9db2fef
--- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision a2b07e1644d6345cd1f6cae619ae9087f25a60d4)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java	(.../LdTemplateController.java)	(revision 0098ee98c13ace879187e62498b19cada9db2fef)
@@ -1352,38 +1352,40 @@
 	    request.setAttribute("topicNumber", topicNumber);
 	}
 	String forward = request.getParameter("forward");
-	String path;
-	switch (forward) {
-	    case ("init"):
-		path = "authoring/template/tbl/tbl";
-		break;
-	    case ("question"):
-		path = "authoring/template/tool/mcquestion";
-		break;
-	    case ("questionoption"):
-		path = "authoring/template/tool/mcoption";
-		break;
-	    case ("redooption"):
-		path = "authoring/template/tool/mcredooption";
-		break;
-	    case ("assess"):
-		path = "authoring/template/tool/assessment";
-		break;
-	    case ("assessmcq"):
-		path = "authoring/template/tool/assessmcq";
-		break;
-	    case ("assessredooption"):
-		path = "authoring/template/tool/assessredooption";
-		break;
-	    case ("assessoption"):
-		path = "authoring/template/tool/assessoption";
-		break;
-	    case ("peerreviewstar"):
-		path = "authoring/template/tool/peerreviewstar";
-		break;
-	    default:
-		path = null;
-		break;
+	String path = null;
+	if (forward != null) {
+        	switch (forward) {
+        	    case ("init"):
+        		path = "authoring/template/tbl/tbl";
+        		break;
+        	    case ("question"):
+        		path = "authoring/template/tool/mcquestion";
+        		break;
+        	    case ("questionoption"):
+        		path = "authoring/template/tool/mcoption";
+        		break;
+        	    case ("redooption"):
+        		path = "authoring/template/tool/mcredooption";
+        		break;
+        	    case ("assess"):
+        		path = "authoring/template/tool/assessment";
+        		break;
+        	    case ("assessmcq"):
+        		path = "authoring/template/tool/assessmcq";
+        		break;
+        	    case ("assessredooption"):
+        		path = "authoring/template/tool/assessredooption";
+        		break;
+        	    case ("assessoption"):
+        		path = "authoring/template/tool/assessoption";
+        		break;
+        	    case ("peerreviewstar"):
+        		path = "authoring/template/tool/peerreviewstar";
+        		break;
+        	    default:
+        		path = null;
+        		break;
+        	}
 	}
 	return (path != null && path.length() > 0 ? path : "authoring/template/tool/mcquestion");
     }
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java
===================================================================
diff -u -rf32bc3c30b8ea0463d84b4dbdc112f77a400297a -r0098ee98c13ace879187e62498b19cada9db2fef
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(.../ExportToolContentController.java)	(revision f32bc3c30b8ea0463d84b4dbdc112f77a400297a)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentController.java	(.../ExportToolContentController.java)	(revision 0098ee98c13ace879187e62498b19cada9db2fef)
@@ -60,7 +60,7 @@
 
     private Logger log = Logger.getLogger(ExportToolContentController.class);
 
-    @RequestMapping("/authoring/exportToolContent")
+    @RequestMapping("/authoring/exportToolContent/export")
     public String execute(HttpServletRequest request, HttpServletResponse response) throws Exception {
 	String param = request.getParameter("method");
 	// -----------------------Resource Author function ---------------------------
Index: lams_central/web/authoring/template/comms.jsp
===================================================================
diff -u -r6c50d024e18f06ca964faa8943c636144e706bed -r0098ee98c13ace879187e62498b19cada9db2fef
--- lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 6c50d024e18f06ca964faa8943c636144e706bed)
+++ lams_central/web/authoring/template/comms.jsp	(.../comms.jsp)	(revision 0098ee98c13ace879187e62498b19cada9db2fef)
@@ -71,7 +71,7 @@
        		
              var jqxhr = $.ajax( {
 	        		method: $(form).attr('method'),
-					url: getSubmissionURL(),
+					url: getSubmissionURL() + '.do',
                 	data: $(form).serialize()
 	            	})
 				.done(function(data) {
@@ -103,7 +103,7 @@
 		}
 		
 		function getSubmissionURL() {
-			return '<lams:WebAppURL />'+$('#template').val().toLowerCase();
+			return '<lams:WebAppURL />authoring/template/'+$('#template').val().toLowerCase();
 		}
 		
 		function doGotoList() {
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r6107b0b2e367c55582da60a59adf70b55e647de6 -r0098ee98c13ace879187e62498b19cada9db2fef
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 6107b0b2e367c55582da60a59adf70b55e647de6)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 0098ee98c13ace879187e62498b19cada9db2fef)
@@ -61,24 +61,24 @@
 }
 
 function returnToMonitorLessonIntegrated( lessonID ) {
-	window.location = '../home/monitorLesson.do?lessonID='+lessonID;
+	window.location = '/lams/home/monitorLesson.do?lessonID='+lessonID;
 }
 
 function openMonitorLesson( lessonID ) {
 	if (isMac) {
 		if(belowMinRes) {
-			monitorLessonWin = window.open('../home/monitorLesson.do?lessonID='+ lessonID,'mWindow','width=' + monitor_width 
+			monitorLessonWin = window.open('/lams/home/monitorLesson.do?lessonID='+ lessonID,'mWindow','width=' + monitor_width 
 							   + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
 		} else {
-			monitorLessonWin = window.open('../home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
+			monitorLessonWin = window.open('/lams/home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
 							   + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
 		}
 	} else {
 		if (monitorLessonWin && !monitorLessonWin.closed) {
-			monitorLessonWin.location = '../home/monitorLesson.do?lessonID='+lessonID;
+			monitorLessonWin.location = '/lams/home/monitorLesson.do?lessonID='+lessonID;
 			monitorLessonWin.focus();
 		} else {
-			monitorLessonWin = window.open('../home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
+			monitorLessonWin = window.open('/lams/home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
 							   + ',height=' + monitor_height + ',resizable,resizable,scrollbars'
 							   + getCenterParams(monitor_width, monitor_height));
 		}
@@ -126,15 +126,15 @@
  */
 function openLearnerShortenedUrl( lessonId ) {
 	if (isMac) {
-		learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width 
+		learnWin = window.open('/lams/home/learner.do?lessonID='+lessonId,'lWindow','width=' + learner_width 
 				   + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 				   + getCenterParams(learner_width, learner_height));
 	} else {
 		if (learnWin && !learnWin.closed ) {
-			learnWin.location = '../home/learner.do?lessonID='+lessonId;		
+			learnWin.location = '/lams/home/learner.do?lessonID='+lessonId;		
 			learnWin.focus();
 		} else {
-			learnWin = window.open('../home/learner.do?lessonID='+lessonId,'lWindow','width='
+			learnWin = window.open('/lams/home/learner.do?lessonID='+lessonId,'lWindow','width='
 					   + learner_width + ',height=' + learner_height + ',resizable,scrollbars=yes,status=yes'
 					   + getCenterParams(learner_width, learner_height));
 		}
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23 -r0098ee98c13ace879187e62498b19cada9db2fef
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 0098ee98c13ace879187e62498b19cada9db2fef)
@@ -40,7 +40,7 @@
 		//constant for croppie.js
 		var PORTRAIT_SIZE = 400;
 	</script>
-	<script type="text/javascript" src="includes/javascript/croppie.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/croppie.js"></script>
 	<script type="text/javascript">
 		//variable defined in croppie.js
 		var croppieWidget;
@@ -124,8 +124,8 @@
 </lams:head>
 
 <body>
-<form:form action="saveportrait.do" method="post" modelAttribute="PortraitActionForm"	 id="PortraitActionForm" enctype="multipart/form-data">
-	<form:hidden name="PortraitActionForm" path="portraitUuid" />
+<form:form action="saveportrait.do" method="post" modelAttribute="PortraitActionForm"	 id="PortraitActionForm" >
+	<form:hidden path="portraitUuid" />
 	<div style="clear: both"></div>
 	
 	<div class="container">
@@ -140,7 +140,7 @@
 					<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" />
+				<img class="img-thumbnail" src="/lams/download?uuid=${PortraitActionForm.portraitUuid}&version=2&preferDownload=false" />
 				</c:otherwise>
 			</c:choose>
 		</div>
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
===================================================================
diff -u -r7e05bfe2c334b0b3224bbbdd3d6b7f10b383ee9f -r0098ee98c13ace879187e62498b19cada9db2fef
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(.../GroupingController.java)	(revision 7e05bfe2c334b0b3224bbbdd3d6b7f10b383ee9f)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java	(.../GroupingController.java)	(revision 0098ee98c13ace879187e62498b19cada9db2fef)
@@ -263,14 +263,14 @@
      * @throws ServletException
      */
     @RequestMapping("/learnerChooseGroup")
-    public String learnerChooseGroup(HttpServletRequest request) throws IOException, ServletException {
+    public String learnerChooseGroup(@ModelAttribute GroupingForm GroupingForm, HttpServletRequest request) throws IOException, ServletException {
 	Activity activity = LearningWebUtil.getActivityFromRequest(request, learnerService);
 	Long groupId = WebUtil.readLongParam(request, "groupId");
 	LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgress(request, learnerService);
 	Long lessonId = learnerProgress.getLesson().getLessonId();
 	learnerService.learnerChooseGroup(lessonId, activity.getActivityId(), groupId, LearningWebUtil.getUserId());
 
-	String redirectURL = "/grouping/performGrouping.do";
+	String redirectURL = "redirect:/grouping/performGrouping.do";
 	redirectURL = WebUtil.appendParameterToURL(redirectURL, "activityID", activity.getActivityId().toString());
 
 	return redirectURL;
Index: lams_learning/web/grouping/choose.jsp
===================================================================
diff -u -r580d89078524d7f06eccd71feefc7e6f98717538 -r0098ee98c13ace879187e62498b19cada9db2fef
--- lams_learning/web/grouping/choose.jsp	(.../choose.jsp)	(revision 580d89078524d7f06eccd71feefc7e6f98717538)
+++ lams_learning/web/grouping/choose.jsp	(.../choose.jsp)	(revision 0098ee98c13ace879187e62498b19cada9db2fef)
@@ -97,8 +97,8 @@
 								</c:when>
 								<c:otherwise>
 									<form:form
-										action="grouping/learnerChooseGroup.do?userId=${user.userID}&activityID=${activityID}&groupId=${group.groupID}"
-										modelAttribute="form${user.userID}${activityID}${group.groupID}" id="form${user.userID}${activityID}${group.groupID}" target="_self">
+										action="learnerChooseGroup.do?userId=${user.userID}&activityID=${activityID}&groupId=${group.groupID}"
+										 modelAttribute="GroupingForm" id="form${user.userID}${activityID}${group.groupID}" >
 									</form:form>							
 									<button type="button" class="btn btn-sm btn-primary" 
 										data-toggle="modal" data-target="#confirmationModal"