Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
diff -u -r87ff0b33fa2d006a084b2ae9b7ff14d4c4be0f6d -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 87ff0b33fa2d006a084b2ae9b7ff14d4c4be0f6d)
+++ lams_tool_lamc/web/authoring/itemlist.jsp	(.../itemlist.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -82,7 +82,7 @@
 
 				<td width="20px">
 					<c:set var="editItemUrl" >
-						<html:rewrite page="/authoring.do"/>?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&reflectionSubject=${mcGeneralAuthoringDTO.reflectionSubject}&KeepThis=true&TB_iframe=true&height=540&width=950&modal=true
+						<html:rewrite page="/authoring.do"/>?dispatch=newEditableQuestionBox&questionIndex=${queIndex}&contentFolderID=${mcGeneralAuthoringDTO.contentFolderID}&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}&toolContentID=${mcGeneralAuthoringDTO.toolContentID}&activeModule=${mcGeneralAuthoringDTO.activeModule}&defaultContentIdStr=${mcGeneralAuthoringDTO.defaultContentIdStr}&sln=${mcGeneralAuthoringDTO.sln}&showMarks=${mcGeneralAuthoringDTO.showMarks}&randomize=${mcGeneralAuthoringDTO.randomize}&questionsSequenced=${mcGeneralAuthoringDTO.questionsSequenced}&retries=${mcGeneralAuthoringDTO.retries}&reflect=${mcGeneralAuthoringDTO.reflect}&KeepThis=true&TB_iframe=true&height=540&width=950&modal=true
 					</c:set>
 					<a href="${editItemUrl}" class="thickbox"> 
 						<img src="${tool}images/edit.gif" border="0" title="<fmt:message key='label.tip.editQuestion'/>">
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r0442ccb60db2d76107e8572c72f1ce4fc6646199 -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 0442ccb60db2d76107e8572c72f1ce4fc6646199)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -122,7 +122,7 @@
 <div id="content">
 
 	<h1>
-		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+		<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 	</h1>
 
 	<html:form styleId="learningForm" action="/learning?method=displayMc&validate=false" enctype="multipart/form-data" method="POST" target="_self">
@@ -161,4 +161,4 @@
 
 </body>
 </lams:html>
-	
\ No newline at end of file
+	
Index: lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/learning/CombinedAnswersContent.jsp	(.../CombinedAnswersContent.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -10,7 +10,7 @@
 <!--options content goes here-->
 
 <p>
-	<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" />
+	<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false" /> 
 </p>
 
 <c:if test="${not empty mcLearnerStarterDTO.submissionDeadline}">
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r0442ccb60db2d76107e8572c72f1ce4fc6646199 -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 0442ccb60db2d76107e8572c72f1ce4fc6646199)
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -35,7 +35,7 @@
 	<div id="content">
 
 		<h1>
-			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 
 		<html:form action="/learning?method=displayMc&validate=false"
@@ -135,7 +135,7 @@
 
 						<c:if test="${(dto.feedback != null) && (dto.feedback != '')}">
 							<div style="overflow: auto;">
-								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="false" /> 
+								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="true" /> 
 							</div>		
 						</c:if>	
 				</div>
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
diff -u -rc369c0326857e08851d03a29d39d4337091f5253 -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision c369c0326857e08851d03a29d39d4337091f5253)
+++ lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -30,19 +30,19 @@
 		<div id="content">
 
 			<h1>
-				<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+				<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 			</h1>
 
 
 
 			<p>
-				<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />
+				<lams:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
 				styleClass="text-area">
 				<c:if test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
-					<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>										
+					<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/>		
 				</c:if>
 			</html:textarea>
 
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -38,7 +38,7 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}"	escapeXml="false" />
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}"	escapeXml="true" />
 		</h1>
 		
 		<c:if test="${isLeadershipEnabled}">
@@ -132,7 +132,7 @@
 							<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}">
 								<c:if test="${(feedbackEntry.value != null) && (feedbackEntry.value != '')}">
 									<div style="overflow: auto;">									  							
-										<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="false" />
+										<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="true" />
 									</div>								
 								</c:if>																			
 							</c:if>
@@ -177,13 +177,13 @@
 									
 			<c:if test="${mcGeneralLearnerFlowDTO.reflection && hasEditRight}">
 				<h2>
-					<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />											
+					<lams:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />		
 				</h2>
 
 				<p>
 					<c:choose>
 						<c:when test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
-							<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>
+							<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/>
 						</c:when>
 						<c:otherwise>
 							<em><fmt:message key="message.no.reflection.available" /></em>  
Index: lams_tool_lamc/web/learning/WaitForLeader.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/learning/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -22,7 +22,7 @@
 
 	<div id="content">
 		<h1>
-			${content.title}
+			<c:out value="${content.title}" escapeXml="true"/>
 		</h1>
 		
 		<h2>
@@ -36,7 +36,7 @@
 		<div>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<div>
-					${user.fullname}
+					<c:out value="${user.fullname}" escapeXml="true"/>
 				</div>
 			</c:forEach>
 		</div>
@@ -53,4 +53,4 @@
 	</div>
 
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_lamc/web/learning/mobile/AnswersContent.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -113,7 +113,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>	
 	</div>
 
@@ -152,4 +152,4 @@
 </div>
 
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_lamc/web/learning/mobile/IndividualLearnerResults.jsp
===================================================================
diff -u -r0442ccb60db2d76107e8572c72f1ce4fc6646199 -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 0442ccb60db2d76107e8572c72f1ce4fc6646199)
+++ lams_tool_lamc/web/learning/mobile/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -27,7 +27,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 	
@@ -133,7 +133,7 @@
 
 						<c:if test="${(dto.feedback != null) && (dto.feedback != '')}">
 							<div style="overflow: auto;">
-								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="false" /> 
+								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="true" /> 
 							</div>		
 						</c:if>												
 					
Index: lams_tool_lamc/web/learning/mobile/Notebook.jsp
===================================================================
diff -u -r34d42662e65de84dc105cdd7df52a9d622392b2d -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/mobile/Notebook.jsp	(.../Notebook.jsp)	(revision 34d42662e65de84dc105cdd7df52a9d622392b2d)
+++ lams_tool_lamc/web/learning/mobile/Notebook.jsp	(.../Notebook.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -14,7 +14,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 	</div><!-- /header -->
 
@@ -28,13 +28,13 @@
 			<html:hidden property="submitReflection" />
 		
 			<p>
-				<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />
+				<lams:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</p>
 
 			<html:textarea cols="60" rows="8" property="entryText"
 				styleClass="text-area">
 				<c:if test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
-					<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>										
+					<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/>
 				</c:if>
 			</html:textarea>
 		</div>
Index: lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -33,7 +33,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}"	escapeXml="false" />
+			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}"	escapeXml="true" />
 		</h1>
 	</div>
 
@@ -131,7 +131,7 @@
 							<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}">
 								<c:if test="${(feedbackEntry.value != null) && (feedbackEntry.value != '')}">
 									<div style="overflow: auto;">									  							
-										<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="false" />
+										<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="true" />
 									</div>								
 								</c:if>																			
 							</c:if>
@@ -180,13 +180,13 @@
 									
 			<c:if test="${mcGeneralLearnerFlowDTO.reflection && hasEditRight}">
 				<h2>
-							<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />											
+							<lams:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 				</h2>
 
 				<p>
 					<c:choose>
 						<c:when test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
-							<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>
+							<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/>
 						</c:when>
 						<c:otherwise>
 							<em><fmt:message key="message.no.reflection.available" /></em>  
Index: lams_tool_lamc/web/learning/mobile/WaitForLeader.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/learning/mobile/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/learning/mobile/WaitForLeader.jsp	(.../WaitForLeader.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -21,7 +21,7 @@
 
 	<div data-role="header" data-theme="b" data-nobackbtn="true">
 		<h1>
-			${content.title}
+			<c:out value="${content.title}" escapeXml="true"/>
 		</h1>
 	</div><!-- /header -->
 
@@ -38,7 +38,7 @@
 		<div>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<div>
-					${user.fullname}
+					<c:out value="${user.fullname}" escapeXml="true"/>
 				</div>
 			</c:forEach>
 		</div>
@@ -55,4 +55,4 @@
 
 </div>
 </body>
-</lams:html>
\ No newline at end of file
+</lams:html>
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -r3f7d82f8f5d0c6881eb83f9ce8c36720e9756649 -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 3f7d82f8f5d0c6881eb83f9ce8c36720e9756649)
+++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -33,13 +33,13 @@
 				<tr>
 					<td>
 						<h2>
-							<c:out value="${mcGeneralLearnerFlowDTO.userName}" escapeXml="false"/>
+							<c:out value="${mcGeneralLearnerFlowDTO.userName}" escapeXml="true"/>
 						</h2>
 					</td>
 				</tr>
 				<tr>
 					<td>
-						<p><c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/></p>
+						<p><lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/></p>
 					</td>
 				</tr>
 			</table>
Index: lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r816baa75867795676ea15c9dfcc4feef712edc47
--- lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
@@ -158,7 +158,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>	
-					${reflectionSubject}
+					<lams:out value="${reflectionSubject}" escapeHtml="true"/>
 				</td>
 			</tr>
 		</c:when>