Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc97471649fc30fae9217a1d2a43d10ce1bbac117 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c97471649fc30fae9217a1d2a43d10ce1bbac117)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -505,6 +505,7 @@
 sysadmin.maintain.session  =Logged in users
 sysadmin.maintain.session.login  =Login
 sysadmin.maintain.session.id  =Session ID
+sysadmin.maintain.session.name =Name
 error.portrait.removal.failed  =Unable to delete portrait. See error file for details
 label.delete.portrait  =Delete portrait
 sysadmin.maintain.session.delete  =Delete
@@ -634,6 +635,4 @@
 outcome.authoring.existing =Added outcomes
 outcome.authoring.existing.none =none
 
-
-
 #======= End labels: Exported 629 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java	(.../SysAdminStartController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java	(.../SysAdminStartController.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -63,6 +63,7 @@
 	    links.add(new LinkBean("ltiConsumerManagement/start.do", "label.manage.tool.consumers"));
 	    links.add(new LinkBean("policyManagement/list.do", "admin.policies.title"));
 	    links.add(new LinkBean("toolcontentlist/start.do", "sysadmin.tool.management"));
+	    links.add(new LinkBean("../outcome/outcomeManage.do", "admin.outcome.title"));
 	    links.add(new LinkBean("themeManagement/start.do", "admin.themes.title"));
 	    links.add(new LinkBean("sessionmaintain/list.do", "sysadmin.maintain.session"));
 	    groupedLinks.add(new Object[] { AdminConstants.START_CONFIG_LINKS, links });
Index: lams_admin/web/sessionmaintain.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -21,13 +21,15 @@
 		<table class="table table-striped">
 			<tr>
 				<th><fmt:message key="sysadmin.maintain.session.login" /></th>
+				<th><fmt:message key="sysadmin.maintain.session.name" /></th>
 				<th><fmt:message key="sysadmin.maintain.session.id" /></th>
 				<th></th>
 			</tr>
 			<c:forEach items="${sessions}" var="ses">
 			<tr>
 				<td><c:out value="${ses.key}" /></td>
-				<td><c:out value="${ses.value}" /></td>
+				<td><c:out value="${ses.value[0]} ${ses.value[1]}" /></td>
+				<td><c:out value="${ses.value[2]}" /></td>
 				<td>
 					<a href="<lams:LAMSURL/>admin/sessionmaintain/delete.do?login=${ses.key}" class="btn btn-default">
 				<fmt:message key="sysadmin.maintain.session.delete" />
Index: lams_build/build.xml
===================================================================
diff -u -r2e97a50e3262b251f5b0adaf53f392d43648ebdf -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_build/build.xml	(.../build.xml)	(revision 2e97a50e3262b251f5b0adaf53f392d43648ebdf)
+++ lams_build/build.xml	(.../build.xml)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -167,6 +167,7 @@
 		<ant antfile="../lams_gradebook/build.xml"         target="_build-product" inheritAll="false" />
 	</target>
 	
+	
 	<target name="_build-ear" depends="_clean-dirs, _build-core">
 		<!-- Internal target: Assembles LAMS EAR in exploded form -->
 		<echo>${ant.project.name}: Copying libraries</echo>
Index: lams_build/build_base.xml
===================================================================
diff -u -rd810074f4b97a88de977bbb34d6362910ea06044 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_build/build_base.xml	(.../build_base.xml)	(revision d810074f4b97a88de977bbb34d6362910ea06044)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -21,6 +21,7 @@
 		<fileset dir="../../lams/lams_build/lib">
 			<include name="**/*.jar" />
 		</fileset>
+		<fileset file="../../lams/lams_common/build/lib/lams.jar" />
 		<!-- Same list as in projects' .classpath file references to WildFly modules.
 			 They need to be exactly listed as **/*.jar would load other versions of JARs
 			 that are also present in lams_build/lib.
@@ -157,7 +158,13 @@
 	<!-- Compilations								                      -->
 	<!-- ================================================================ -->
 
-	<target name="_compile-java" depends="_clean-dirs">
+	<available property="common.jar.exists" file="../../lams/lams_common/build/lib/lams.jar" type="file" />
+	
+	<target name="_build-common" unless="common.jar.exists">
+		<ant antfile="../lams_common/build.xml" target="_build-jar" inheritAll="false"/>
+	</target>
+	
+	<target name="_compile-java-nocommon" depends="_clean-dirs">
 		<!-- Internal target: Compile Java sources. -->
 		<echo>${ant.project.name}: Compiling Java sources</echo>
 		<javac srcdir="${src.java.dir}"
@@ -184,6 +191,8 @@
 		</copy>
 	</target>
 
+	<target name="_compile-java" depends="_build-common, _compile-java-nocommon" />
+
 	<!-- ================================================================ -->
 	<!-- Build archives        		    	          					  -->
 	<!-- ================================================================ -->
@@ -278,16 +287,6 @@
 	</target>
 	
 	
-	<target name="copy-to-lams-lib" if="product.core" depends="_build-jar"
-		    description="Copies JAR file to lams_build/lib/lams for other projects to use.">
-  		<copy overwrite="yes" todir="../../lams/lams_build/lib/lams">
-  			<fileset dir="${basedir}/build/lib">
-  				<include name="${product}.jar"/>
-  			</fileset>
-  		</copy>	
-	</target>
-	
-	
 	<target name="_add-conf-module">
 		<!-- Internal target: Adds subprojects' JAR/WAR to LAMS EAR application.xml -->
 		<property name="moduleActivationPlaceholder" value="&lt;!-- Optional Module Placeholder - do not remove --&gt;" />
Index: lams_build/build_tools_base.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/build_tools_base.xml	(.../build_tools_base.xml)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -46,12 +46,6 @@
 	<!-- Product deployment			                                         -->
 	<!-- =================================================================== -->
 	
-	<target name="copy-to-lams-lib" depends="_target-not-available"
-			    description="Copies JAR file to lams_build/lib/lams for other projects to use.">
-		<echo>Tools JARs need not be copied to lams_build</echo>
-	</target>
-	
-
 	<target name="deploy-tool" depends="_package-create, _package-run" 
 	   description="Build Tool archives and run deployment. Do not run on a production environment." />
 	
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r1de0a203f1cc55783cffd95742782070877781cb -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 1de0a203f1cc55783cffd95742782070877781cb)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -352,7 +352,8 @@
     }
 
     /**
-     * @see org.lamsfoundation.lams.authoring.service.IAuthoringFullService#getToolOutputDefinitions(java.lang.Long, int)
+     * @see org.lamsfoundation.lams.authoring.service.IAuthoringFullService#getToolOutputDefinitions(java.lang.Long,
+     *      int)
      */
     @Override
     public List<ToolOutputDefinitionDTO> getToolOutputDefinitions(Long toolContentID, int definitionType) {
@@ -1560,7 +1561,7 @@
 	access.setAccessDate(new Date());
 	learningDesignDAO.insertOrUpdate(access);
     }
-    
+
     @Override
     public FolderContentDTO getUserWorkspaceFolder(Integer userID) throws IOException {
 	return workspaceManagementService.getUserWorkspaceFolder(userID);
Index: lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java	(.../OutcomeController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java	(.../OutcomeController.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -156,7 +156,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    @RequestMapping("/outcomeEdit")
+    @RequestMapping("/outcomeSave")
     public String outcomeSave(@ModelAttribute OutcomeForm outcomeForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	Integer userId = getUserDTO().getUserID();
@@ -575,7 +575,7 @@
     }
 
     @RequestMapping("/scaleEdit")
-    public String scaleEdit(@ModelAttribute OutcomeScaleForm scaleForm, HttpServletRequest request,
+    public String scaleEdit(@ModelAttribute("scaleForm") OutcomeScaleForm scaleForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	Integer userId = getUserDTO().getUserID();
 	Long scaleId = WebUtil.readLongParam(request, "scaleId", true);
@@ -613,7 +613,7 @@
     }
 
     @RequestMapping("/scaleSave")
-    public String scaleSave(@ModelAttribute OutcomeScaleForm scaleForm, HttpServletRequest request,
+    public String scaleSave(@ModelAttribute("scaleForm") OutcomeScaleForm scaleForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	Integer userId = getUserDTO().getUserID();
 	Long scaleId = scaleForm.getScaleId();
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -r24961a0e4692ce893e1903a9ab498f34aaf012b8 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 24961a0e4692ce893e1903a9ab498f34aaf012b8)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -2,28 +2,27 @@
 <%@ 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="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/outcome.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/outcome.css" type="text/css" media="screen" />
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/outcome.js"></script>
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 	<script type="text/javascript">
 		<c:if test="${saved}">
 			var outcomesFrame = $('#dialogOutcome iframe', window.parent.document);
 			if (outcomesFrame.length == 0) {
 				window.parent.document.location.href = 
-					'<lams:LAMSURL/>outcome.do?method=outcomeManage${empty param.organisationID ? "" : "&organisationID=param.organisationID"}';
+					'<lams:LAMSURL/>outcome/outcomeManage.do${empty param.organisationID ? "" : "?organisationID=param.organisationID"}';
 			} else {
 				outcomesFrame.attr('src', outcomesFrame.attr('src'));
 				$('#dialogOutcomeEdit', window.parent.document).remove();
@@ -49,44 +48,36 @@
 </lams:head>
 <body>
 
-<html:form action="/outcome.do" method="post" styleId="outcomeForm">
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="formDisabled" value="${not empty formBean.outcomeId and empty formBean.organisationId and not canManageGlobal}" />
+<form:form action="outcomeSave.do" method="post" modelAttribute="outcomeForm">
+	<c:set var="formDisabled" value="${not empty outcomeForm.outcomeId and empty outcomeForm.organisationId and not canManageGlobal}" />
 
-	<input type="hidden" name="method" value="outcomeSave" />
-	<html:hidden property="outcomeId" />
-	<html:hidden property="organisationId" />
-	<html:hidden property="contentFolderId" />
+	<form:hidden path="outcomeId" />
+	<form:hidden path="organisationId" />
+	<form:hidden path="contentFolderId" />
 	
 	<div class="container">
 		<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">
 					<div class="panel-body">
-						<%-- Error Messages --%>
-						<logic:messagesPresent>
-							<lams:Alert type="danger" close="false">
-							        <html:messages id="error">
-							            <c:out value="${error}" escapeXml="false"/><br/>
-							        </html:messages>
-							</lams:Alert>
-						</logic:messagesPresent>
+					
+						<lams:errors/>
 						
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.name" />:
-								<html:text property="name" size="50" maxlength="255" styleClass="form-control" disabled="${formDisabled}" />
+								<form:input path="name" size="50" maxlength="255" cssClass="form-control" disabled="${formDisabled}" />
 							</label>
 						</div>
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.code" />:
-								<html:text property="code" size="50" maxlength="50" styleClass="form-control" disabled="${formDisabled}" />
+								<form:input path="code" size="50" maxlength="50" cssClass="form-control" disabled="${formDisabled}" />
 							</label>
 						</div>
 						<div class="form-group">
 							<fmt:message key="outcome.manage.scope" />:
 							<c:choose>
-								<c:when test="${empty formBean.organisationId}">
+								<c:when test="${empty outcomeForm.organisationId}">
 									<fmt:message key="outcome.manage.scope.global" />
 								</c:when>
 								<c:otherwise>
@@ -96,13 +87,13 @@
 						</div>
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.scale" />:
-								<html:select property="scaleId"  styleClass="form-control" disabled="${formDisabled}">
+								<form:select path="scaleId"  cssClass="form-control" disabled="${formDisabled}">
 									<c:forEach items="${scales}" var="scale">
-										<html:option value="${scale.scaleId}">
+										<form:option value="${scale.scaleId}">
 											<c:out value="${scale.name}" /> (<c:out value="${scale.code}" />)
-										</html:option>
+										</form:option>
 									</c:forEach>
-								</html:select>
+								</form:select>
 							</label>
 							<button type="button" class="btn btn-default" onClick="javascript:openOutcomeScaleDialog()">
 								<fmt:message key="scale.manage" />
@@ -113,10 +104,10 @@
 							<c:choose>
 								<c:when test="${formDisabled}">
 									<br />
-									<c:out value="${formBean.description}" />
+									<c:out value="${outcomeForm.description}" />
 								</c:when>
 								<c:otherwise>
-									 <lams:CKEditor id="description" value="${formBean.description}" contentFolderID="${formBean.contentFolderId}"></lams:CKEditor>
+									 <lams:CKEditor id="description" value="${outcomeForm.description}" contentFolderID="${outcomeForm.contentFolderId}"></lams:CKEditor>
 								</c:otherwise>
 							</c:choose>
 						</div>
@@ -130,6 +121,6 @@
 			</button>
 		</c:if>
 	</div>
-</html:form>
+</form:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_central/web/outcome/outcomeManage.jsp
===================================================================
diff -u -r39b3310a4aa2fad6567aeaa89a08dc9ae0084196 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 39b3310a4aa2fad6567aeaa89a08dc9ae0084196)
+++ lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -2,23 +2,21 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
 		<title><fmt:message key="index.outcome.manage" /></title>
 	<lams:css/>
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/outcome.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/outcome.css" type="text/css" media="screen" />
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/outcome.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cookie.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 	<script type="text/javascript">
 		var organisationId = '${param.organisationID}',
 			LAMS_URL = '<lams:LAMSURL/>',
@@ -36,13 +34,7 @@
 </lams:head>
 <body class="stripes">
 <lams:Page type="admin" >
-	<logic:messagesPresent>
-		<lams:Alert id="error" close="false" type="danger">
-			<html:messages id="error">
-				<c:out value="${error}" escapeXml="false" />
-			</html:messages>
-		</lams:Alert>
-	</logic:messagesPresent>
+	<lams:errors path="*"/>
 	
 	<div class="outcomeContainer">
 		<div class="row">
@@ -115,8 +107,7 @@
 			<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
 				<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
 			</div>
-			<form id="importForm" action="outcome.do" method="post" enctype="multipart/form-data">
-				<input type="hidden" name="method" value="outcomeImport" />
+			<form id="importForm" action="outcome/outcomeImport.do" method="post" enctype="multipart/form-data">
 				<input type="file" id="importInput" name="file"/>
 			</form>
 		</c:if>
Index: lams_central/web/outcome/scaleEdit.jsp
===================================================================
diff -u -r24961a0e4692ce893e1903a9ab498f34aaf012b8 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision 24961a0e4692ce893e1903a9ab498f34aaf012b8)
+++ lams_central/web/outcome/scaleEdit.jsp	(.../scaleEdit.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -2,28 +2,27 @@
 <%@ 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="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/outcome.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/outcome.css" type="text/css" media="screen" />
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/outcome.js"></script>
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 	<script type="text/javascript">
 		<c:if test="${saved}">
 			var scalesFrame = $('#dialogOutcomeScale iframe', window.parent.document);
 			if (scalesFrame.length == 0) {
 				window.parent.document.location.href = 
-					'<lams:LAMSURL/>outcome.do?method=scaleManage${empty param.organisationID ? "" : "&organisationID=param.organisationID"}';
+					'<lams:LAMSURL/>outcome/scaleManage.do${empty param.organisationID ? "" : "?organisationID=param.organisationID"}';
 			} else {
 				scalesFrame.attr('src', scalesFrame.attr('src'));
 				$('#dialogOutcomeScaleEdit', window.parent.document).remove();
@@ -35,44 +34,36 @@
 </lams:head>
 <body>
 
-<html:form action="/outcomeScale.do" method="post" styleId="scaleForm">
-	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-	<c:set var="formDisabled" value="${isDefaultScale or (not empty formBean.scaleId and empty formBean.organisationId and not canManageGlobal)}" />
+<form:form action="scaleSave.do" method="post" modelAttribute="scaleForm">
+	<c:set var="formDisabled" value="${isDefaultScale or (not empty scaleForm.scaleId and empty scaleForm.organisationId and not canManageGlobal)}" />
 
-	<input type="hidden" name="method" value="scaleSave" />
-	<html:hidden property="scaleId" />
-	<html:hidden property="organisationId" />
-	<html:hidden property="contentFolderId" />
+	<form:hidden path="scaleId" />
+	<form:hidden path="organisationId" />
+	<form:hidden path="contentFolderId" />
 	
 	<div class="container">
 		<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">
 					<div class="panel-body">
-						<%-- Error Messages --%>
-						<logic:messagesPresent>
-							<lams:Alert type="danger" close="false">
-							        <html:messages id="error">
-							            <c:out value="${error}" escapeXml="false"/><br/>
-							        </html:messages>
-							</lams:Alert>
-						</logic:messagesPresent>
+					
+						<lams:errors/>
 						
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.name" />:
-								<html:text property="name" size="50" maxlength="255" styleClass="form-control" disabled="${formDisabled}" />
+								<form:input path="name" size="50" maxlength="255" styleClass="form-control" disabled="${formDisabled}" />
 							</label>
 						</div>
 						<div class="form-group">
 							<label><fmt:message key="outcome.manage.add.code" />:
-								<html:text property="code" size="50" maxlength="50" styleClass="form-control" disabled="${formDisabled}" />
+								<form:input path="code" size="50" maxlength="50" styleClass="form-control" disabled="${formDisabled}" />
 							</label>
 						</div>
 						<div class="form-group">
 							<fmt:message key="outcome.manage.scope" />:
 							<c:choose>
-								<c:when test="${empty formBean.organisationId}">
+								<c:when test="${empty scaleForm.organisationId}">
 									<fmt:message key="outcome.manage.scope.global" />
 								</c:when>
 								<c:otherwise>
@@ -82,7 +73,7 @@
 						</div>
 						<div class="form-group">
 							<label><fmt:message key="scale.manage.add.value" />:<br />
-								<html:textarea property="items" disabled="${formDisabled}" />
+								<form:textarea path="items" disabled="${formDisabled}" />
 								<lams:Alert type="info" close="false">
 							        <fmt:message key="scale.manage.add.value.info" />
 								</lams:Alert>
@@ -93,10 +84,10 @@
 							<c:choose>
 								<c:when test="${formDisabled}">
 									<br />
-									<c:out value="${formBean.description}" />
+									<c:out value="${scaleForm.description}" />
 								</c:when>
 								<c:otherwise>
-									 <lams:CKEditor id="description" value="${formBean.description}" contentFolderID="${formBean.contentFolderId}"></lams:CKEditor>
+									 <lams:CKEditor id="description" value="${scaleForm.description}" contentFolderID="${scaleForm.contentFolderId}"></lams:CKEditor>
 								</c:otherwise>
 							</c:choose>
 						</div>
@@ -110,6 +101,6 @@
 			</button>
 		</c:if>
 	</div>
-</html:form>
+</form:form>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_central/web/outcome/scaleManage.jsp
===================================================================
diff -u -r48dc62244b557fd73807f2355b80b63be73154a3 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 48dc62244b557fd73807f2355b80b63be73154a3)
+++ lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -2,22 +2,20 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-logic" prefix="logic" %>
-<%@ taglib uri="tags-html" prefix="html" %>
 
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
 	<lams:css/>
-	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
-	<link rel="stylesheet" href="css/outcome.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/outcome.css" type="text/css" media="screen" />
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="includes/javascript/outcome.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery.cookie.js"></script>
-	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/outcome.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.cookie.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 	<script type="text/javascript">
 		var organisationId = '${param.organisationID}',
 			LAMS_URL = '<lams:LAMSURL/>',
@@ -35,14 +33,9 @@
 </lams:head>
 <body class="stripes">
 <lams:Page type="admin" >
-	<logic:messagesPresent>
-		<lams:Alert id="error" close="false" type="danger">
-			<html:messages id="error">
-				<c:out value="${error}" escapeXml="false" />
-			</html:messages>
-		</lams:Alert>
-	</logic:messagesPresent>
-	
+
+	<lams:errors/>	
+
 	<div class="outcomeContainer">
 		<div class="row">
 			<div class="col-xs-5">
@@ -111,8 +104,7 @@
 			<div id="importButton" class="btn btn-default pull-left" onClick="javascript:$('#importInput').click()">
 				<i class="fa fa-upload"></i> <fmt:message key="outcome.import" />
 			</div>
-			<form id="importForm" action="outcomeScale.do" method="post" enctype="multipart/form-data">
-				<input type="hidden" name="method" value="scaleImport" />
+			<form id="importForm" action="outcome/scaleImport.do" method="post" enctype="multipart/form-data">
 				<input type="file" id="importInput" name="file"/>
 			</form>
 		</c:if>
Index: lams_common/build.xml
===================================================================
diff -u -r0efd8612f86d8944c04c4fb15e073500460cd764 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_common/build.xml	(.../build.xml)	(revision 0efd8612f86d8944c04c4fb15e073500460cd764)
+++ lams_common/build.xml	(.../build.xml)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -4,6 +4,8 @@
 	
 	<import file="../lams_build/build_base.xml"/>
 	
+	<target name="_compile-java" depends="_compile-java-nocommon" />
+	
 	<target name="build-db" depends="_clean-dirs"
 		description="Rebuilds LAMS database.">
 		
Index: lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java	(.../SessionManager.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java	(.../SessionManager.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -23,6 +23,8 @@
 
 package org.lamsfoundation.lams.web.session;
 
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
@@ -32,6 +34,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
 public class SessionManager {
     public static final String SYS_SESSION_COOKIE = "JSESSIONID";
     // if this attribute is set in session, next call will force the user to log out
@@ -204,10 +209,16 @@
     /**
      * Lists all logins with their assigned sessions
      */
-    public static Map<String, String> getLoginToSessionIDMappings() {
-	Map<String, String> result = new TreeMap<String, String>();
+    public static Map<String, List<String>> getLoginToSessionIDMappings() {
+	Map<String, List<String>> result = new TreeMap<String, List<String>>();
 	for (Entry<String, HttpSession> entry : loginMapping.entrySet()) {
-	    result.put(entry.getKey(), entry.getValue().getId());
+	    HttpSession session = entry.getValue();
+	    UserDTO user = (UserDTO) session.getAttribute(AttributeNames.USER);
+	    List<String> sessionInfo = new LinkedList<String>();
+	    sessionInfo.add(user.getFirstName());
+	    sessionInfo.add(user.getLastName());
+	    sessionInfo.add(session.getId());
+	    result.put(entry.getKey(), sessionInfo);
 	}
 	return result;
     }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
diff -u -r31c98cf20da4c80ce2a9cee72a502e0a884b7d7a -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(.../GBUserGridRowDTO.java)	(revision 31c98cf20da4c80ce2a9cee72a502e0a884b7d7a)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(.../GBUserGridRowDTO.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -87,7 +87,7 @@
 	    ret.add((mark != null) ? GradebookUtil.niceFormatting(mark) : CELL_EMPTY);
 	    ret.add(portraitId != null ? portraitId.toString() : "");
 	    if (activityUrl != null && activityUrl.length() != 0) {
-		ret.add("javascript:launchPopup(\"" + activityUrl + "\",\"" + rowName + "\",796,570)'>");
+		ret.add("javascript:launchPopup(\"" + activityUrl + "\",\"" + rowName + "\")'>");
 	    }
 	    ret.add(String.valueOf(hasArchivedMarks));
 
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -r86c3193e3b58ecd032fc3df4503627e510ec6c0e -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 86c3193e3b58ecd032fc3df4503627e510ec6c0e)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -116,7 +116,6 @@
  * @author lfoxton
  */
 public class GradebookService implements IGradebookFullService {
-
     private static Logger logger = Logger.getLogger(GradebookService.class);
 
     private static final ExcelCell[] EMPTY_ROW = new ExcelCell[4];
@@ -418,6 +417,10 @@
 		    gUserDTO.setMark(gradebookUserActivity.getMark());
 
 		}
+		
+		boolean hasArchivedMarks = gradebookDAO.hasArchivedMarks(lesson.getLessonId(), learner.getUserId());
+		gUserDTO.setHasArchivedMarks(hasArchivedMarks);
+		
 		gradebookUserDTOs.add(gUserDTO);
 	    }
 	}
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java	(.../GradebookController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java	(.../GradebookController.java)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -182,7 +182,7 @@
 	// Getting userID param, it is passed differently from different views
 	UserDTO currentUserDTO = getUser();
 	Integer userID = null;
-	if (view == GBGridView.MON_USER) {
+	if (view == GBGridView.MON_USER || view == GBGridView.MON_ACTIVITY) {
 	    userID = WebUtil.readIntParam(request, GradebookConstants.PARAM_USERID);
 	} else if (view == GBGridView.LRN_ACTIVITY) {
 	    if (currentUserDTO != null) {
@@ -194,7 +194,7 @@
 
 	// Get the user gradebook list from the db
 	// A slightly different list is needed for userview or activity view
-	if ((view == GBGridView.MON_USER) || (view == GBGridView.LRN_ACTIVITY)) {//2nd level && from personal marks page (2nd level or 1st)
+	if ((view == GBGridView.MON_USER) || (view == GBGridView.LRN_ACTIVITY) || (view == GBGridView.MON_ACTIVITY)) {//2nd level && from personal marks page (2nd level or 1st)
 	    gradebookActivityDTOs = gradebookService.getGBActivityArchiveRowsForLearner(activityID, userID,
 		    currentUserDTO.getTimeZone());
 	}
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r188e41ace27b77bfaed24c07b92a0f180ac0a20d -rfd2cfad55c7c517931f69334ce644d509ec28140
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 188e41ace27b77bfaed24c07b92a0f180ac0a20d)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision fd2cfad55c7c517931f69334ce644d509ec28140)
@@ -24,7 +24,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
  	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />gradebook/includes/javascript/blockexportbutton.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/x-editable.js"></script>
 	
 	<script type="text/javascript">
 	
@@ -403,7 +403,7 @@
 									     colModel: [
 									       	{name:'id', index:'id',  sortable:false, editable: false ,width:140, align:"right"},
 											{name:'status',  index:'status', sortable:false, editable:false, width:30, align:"center"},
-											{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:50, title : true, align:"center",
+											{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:52, title : true, align:"center",
 												cellattr: function(rowID, val, rawObject, cm, rdata) {
 													if (rdata.startDate != "-") {
 														return 'title="' + rdata.startDate + ' - ' + rdata.finishDate + '"';
@@ -419,37 +419,10 @@
 									     loadError: function(xhr,st,err) {
 									    	jQuery("#"+subgrid_table_id).clearGridData();
 									 	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
-									     },
-									     formatCell: function(rowid, cellname,value, iRow, iCol) {
-								    	 	if (cellname == "mark") {
-								    	 		
-								    	 		var rowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
-								    	 		var string = removeHTMLTags(rowData["mark"]);
-								    	 		
-								    	 		
-								    	 		if (string.indexOf("-") != -1)
-								    	 		{
-								    	 			string = " ";
-								    	 			
-								    	 		} else if (string.indexOf("/") != -1) {
-								    	 			splits = string.split("/");
-								    	 			
-								    	 			if(splits.length == 2) {
-								    	 				tempMark = splits[0];
-								    	 				string = " ";
-								    	 			} else {
-								    	 				string = " ";
-								    	 			}
-								    	 		}
-								    	 		
-								    	 		return string;
-								    	 		
-								    	 	}
-								    	 }
+									     }
 								  	});
-							}
+								}
 					  	}).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}); // applying refresh button
-					  
 					},
 					gridComplete: function(){
 				   	 	initializePortraitPopover('<lams:LAMSURL/>');
@@ -530,7 +503,8 @@
 						     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
 						     	"<fmt:message key="gradebook.columntitle.mark"/>",
 							    'portraitId',
-						     	'activityURL'
+						     	'activityURL',
+						     	'hasArchivedMarks'
 						     ],
 						     colModel:[
 						     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
@@ -547,7 +521,8 @@
 						     	{name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false, width:200, hidden:true},
 						     	{name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"},
 						     	{name:'portraitId', index:'portraitId', width:0, hidden: true},
-						     	{name:'activityURL', index:'activityURL', width:0, hidden: true}
+						     	{name:'activityURL', index:'activityURL', width:0, hidden: true},
+							    {name:'hasArchivedMarks', index:'hasArchivedMarks', width:0, hidden: true}
 						     ],
 						     loadError: function(xhr,st,err) {
 						    		jQuery("#"+subgrid_table_id).clearGridData();
@@ -619,7 +594,62 @@
 							 gridComplete: function(){
 						   	 	initializePortraitPopover('<lams:LAMSURL/>');
 						   	 	fixPagerInCenter(subgrid_table_id+"_pager", 1);
-							 }
+							 },
+							 subGrid : true,
+							 subGridOptions: {
+							    hasSubgrid: function (options) {
+							        return options.data.hasArchivedMarks == 'true';
+							    }
+							 },
+							 subGridRowExpanded: function(subgrid_id, row_id) {
+							    var subgrid_table_id = subgrid_id + "_t",
+							    	nameParts = subgrid_id.split("_"),
+							   	    activityID = nameParts[1],
+							   	    userID = nameParts[3];
+								jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll archive'></table><div id='"+subgrid_table_id+"_pager' class='scroll' ></div>");
+								jQuery("#"+subgrid_table_id).jqGrid({
+										 guiStyle: "bootstrap",
+										 iconSet: 'fontAwesome',
+										 autoencode:false,
+									     datatype: "xml",
+									     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityArchiveGridData&lessonID=${lessonDetails.lessonID}&activityID="
+										      + activityID + "&view=monActivityView&userID=" + userID,
+									     height: "100%",
+									     autowidth:true,
+									     cellEdit:false,
+									     pager: false,
+									     colNames: [
+									    	"<fmt:message key="gradebook.columntitle.attempt"/>",
+									     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
+									     	"<fmt:message key="gradebook.columntitle.lesson.mark"/>",
+									     	"<fmt:message key="gradebook.columntitle.progress"/>",
+									     	"<fmt:message key="gradebook.columntitle.timeTaken"/>", 
+									    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
+									    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
+									     	"<fmt:message key="gradebook.columntitle.mark"/>"
+									     ],
+									     colModel: [
+									       	{name:'id', index:'id',  sortable:false, editable: false, align:"right"},
+											{name:'feedback',  index:'feedback', sortable:false, editable: false, hidden:true},
+											{name:'lessonMark',  index:'lessonMark', sortable:false, editable: false,width: 180, align:"center" },
+											{name:'status',  index:'status', sortable:false, editable:false, width:65, align:"center"},
+											{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:112, title : true, align:"center",
+												cellattr: function(rowID, val, rawObject, cm, rdata) {
+													if (rdata.startDate != "-") {
+														return 'title="' + rdata.startDate + ' - ' + rdata.finishDate + '"';
+													}
+										    	}
+									    	},
+										    {name:'startDate',index:'startDate', width:0, hidden: true},
+										    {name:'finishDate',index:'finishDate', width:0, hidden: true},
+											{name:'mark', index:'mark', sortable:false, editable: false, width:108, align:"center" }
+									     ],
+									     loadError: function(xhr,st,err) {
+									    	jQuery("#"+subgrid_table_id).clearGridData();
+									 	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
+									     }
+								  	});
+								}
 						 }).navGrid("#"+subgrid_table_id+"_pager", {edit:false,add:false,del:false,search:false}) // applying refresh button
 						 jQuery("#"+subgrid_table_id).jqGrid('filterToolbar');