Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -r4733acfb8383875b508dffd7359d3c8fd8271c0e -r139e91caa1fc95af99802e31cb3a4b57ef7ebc5e
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 4733acfb8383875b508dffd7359d3c8fd8271c0e)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 139e91caa1fc95af99802e31cb3a4b57ef7ebc5e)
@@ -22,7 +22,6 @@
 	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap-slider.js"></script>
 
-	<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
 	<%-- param has higher level for request attribute --%>
 	<c:if test="${not empty param.sessionMapID}">
 		<c:set var="sessionMapID" value="${param.sessionMapID}" />
@@ -104,7 +103,7 @@
 			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
 		</c:if>
 		
-		<%@ include file="/common/messages.jsp"%>
+		<lams:errors/>
 		<br>
 		
 		<%@ include file="results/attemptsummary.jsp"%>
@@ -113,7 +112,11 @@
 			<div class="panel">
 				<c:out value="${assessment.instructions}" escapeXml="false"/>
 			</div>
+<<<<<<< HEAD
+		
+=======
 			
+>>>>>>> refs/remotes/origin/master
 			<div class="form-group">
 				<%@ include file="results/allquestions.jsp"%>
 				
@@ -149,10 +152,10 @@
 						</c:choose>
 			
 						<c:if test="${(mode != 'teacher') && hasEditRight}">
-							<html:button property="FinishButton" onclick="return continueReflect()" 
-									styleClass="btn btn-sm btn-default pull-left voffset10">
+							<button type="button" name="FinishButton" onclick="return continueReflect()" 
+									class="btn btn-sm btn-default pull-left voffset10">
 								<fmt:message key="label.edit" />
-							</html:button>
+							</button>
 						</c:if>
 					</div>
 		
@@ -171,10 +174,10 @@
 				<c:if test="${! sessionMap.isUserFailed}">
 					<c:choose>
 						<c:when	test="${sessionMap.reflectOn && (not sessionMap.userFinished) && hasEditRight}">
-							<html:button property="FinishButton" onclick="return continueReflect()" 
-									styleClass="btn btn-primary voffset10 pull-right na">
+							<button type="button" name="FinishButton" onclick="return continueReflect()" 
+									class="btn btn-primary voffset10 pull-right na">
 								<fmt:message key="label.continue" />
-							</html:button>
+							</button>
 						</c:when>
 						
 						<c:otherwise>