Index: lams_tool_leader/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/pages/export/exportPortfolio.jsp	8 Jan 2014 20:13:51 -0000	1.1
+++ lams_tool_leader/web/pages/export/exportPortfolio.jsp	29 Mar 2014 20:26:11 -0000	1.2
@@ -5,7 +5,7 @@
 
 <html>
 	<lams:head>
-		<title><c:out value="${leaderselectionDTO.title}" escapeXml="false" />
+		<title><c:out value="${leaderselectionDTO.title}" escapeXml="true" />
 		</title>
 		<lams:css localLinkPath="../" />
 	</lams:head>
@@ -15,7 +15,7 @@
 		<div id="content">
 
 			<h1>
-				<c:out value="${leaderselectionDTO.title}" escapeXml="false" />
+				<c:out value="${leaderselectionDTO.title}" escapeXml="true" />
 			</h1>
 
 			<p>
@@ -38,7 +38,7 @@
 						<fmt:message key="heading.leader" /> 
 						<c:choose>
 							<c:when test="${session.groupLeader != null}">
-								${session.groupLeader.firstName} ${session.groupLeader.lastName}
+								<c:out value="${session.groupLeader.firstName} ${session.groupLeader.lastName}" escapeXml="true"/>
 							</c:when>
 							<c:otherwise>
 								<fmt:message key="label.no.leader.yet" />
Index: lams_tool_leader/web/pages/learning/leaderselection.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/learning/leaderselection.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/pages/learning/leaderselection.jsp	8 Jan 2014 20:13:48 -0000	1.1
+++ lams_tool_leader/web/pages/learning/leaderselection.jsp	29 Mar 2014 20:26:11 -0000	1.2
@@ -34,16 +34,20 @@
     }
 </script>
 
+<c:set var="contentTitle">
+  <c:out value="${content.title}" escapeXml="true"/>
+</c:set>
+
 <div id="content">
 	<h1>
-		${content.title}
+		<c:out value="${contentTitle}" escapeXml="false"/>
 	</h1>
 	
 	<h4>
 		<fmt:message key="label.group.leader" />
 		<c:choose>
 			<c:when test="${not empty groupLeader}">
-				${groupLeader.firstName} ${groupLeader.lastName}
+				<c:out value="${groupLeader.firstName} ${groupLeader.lastName}" escapeXml="true"/>
 			</c:when>
 			<c:otherwise>
 				<i><fmt:message key="label.no.leader.yet" /></i>
@@ -59,7 +63,7 @@
 		<ul>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<li>
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</li>
 			</c:forEach>
 		</ul>
@@ -81,10 +85,12 @@
 	</div>
 
 </div>
-
-<div id="leaderSelectionDialog" title="${content.title}" class="dialog">
+<c:set var="title">
+	<c:out value="${contentTitle}" escapeXml="true"/>
+</c:set>
+<div id="leaderSelectionDialog" title="${title}" class="dialog">
 	<div style="font-weight:bold; margin: 10px 0 20px;">
-		${content.instructions}
+		<c:out value="${content.instructions}" escapeXml="false"/>
 		<br>
 		<fmt:message key="label.are.you.going.to.be.leader" />
 	</div>
@@ -96,7 +102,7 @@
 	<div style="text-align: right;">
 		<c:forEach var="user" items="${groupUsers}" varStatus="status">
 			<div>
-				${user.firstName} ${user.lastName}
+				<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 			</div>
 		</c:forEach>
 	</div>
Index: lams_tool_leader/web/pages/learning/mobile/leaderselection.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/learning/mobile/leaderselection.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/pages/learning/mobile/leaderselection.jsp	8 Jan 2014 20:13:49 -0000	1.1
+++ lams_tool_leader/web/pages/learning/mobile/leaderselection.jsp	29 Mar 2014 20:26:11 -0000	1.2
@@ -35,7 +35,7 @@
 
 <div data-role="header" data-theme="b" data-nobackbtn="true">
 	<h1>
-		${content.title}
+		<c:out value="${content.title}" escapeXml="true"/>
 	</h1>
 </div>
 
@@ -45,7 +45,7 @@
 		<fmt:message key="label.group.leader" />
 		<c:choose>
 			<c:when test="${not empty groupLeader}">
-				${groupLeader.firstName} ${groupLeader.lastName}
+				<c:out value="${groupLeader.firstName} ${groupLeader.lastName}" escapeXml="true"/>
 			</c:when>
 			<c:otherwise>
 				<i><fmt:message key="label.no.leader.yet" /></i>
@@ -61,7 +61,7 @@
 		<ul>
 			<c:forEach var="user" items="${groupUsers}" varStatus="status">
 				<li>
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</li>
 			</c:forEach>
 		</ul>
Index: lams_tool_leader/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/monitoring/editActivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/pages/monitoring/editActivity.jsp	8 Jan 2014 20:13:47 -0000	1.1
+++ lams_tool_leader/web/pages/monitoring/editActivity.jsp	29 Mar 2014 20:26:11 -0000	1.2
@@ -15,7 +15,7 @@
 				<fmt:message key="label.authoring.basic.title" />
 			</td>
 			<td>
-				<c:out value="${dto.title}" escapeXml="false" />
+				<c:out value="${dto.title}" escapeXml="true" />
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_leader/web/pages/monitoring/manageLeaders.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/monitoring/manageLeaders.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	8 Jan 2014 20:13:47 -0000	1.1
+++ lams_tool_leader/web/pages/monitoring/manageLeaders.jsp	29 Mar 2014 20:26:11 -0000	1.2
@@ -54,7 +54,7 @@
 						<c:forEach var="user" items="${session.userDTOs}">
 							<div>
 								<input type="radio" name="sessionId${session.sessionID}" value="${user.uid}" <c:if test="${session.groupLeader.uid == user.uid}">checked="checked"</c:if>/>
-								${user.firstName} ${user.lastName}
+								<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 							</div>
 						</c:forEach>
 					</div>
Index: lams_tool_leader/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/pages/monitoring/summary.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/pages/monitoring/summary.jsp	8 Jan 2014 20:13:46 -0000	1.1
+++ lams_tool_leader/web/pages/monitoring/summary.jsp	29 Mar 2014 20:26:11 -0000	1.2
@@ -26,7 +26,7 @@
 		<c:forEach var="user" items="${session.userDTOs}">
 			<tr>
 				<td width="30%" style="padding: 5px 0;">
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</td>
 				<td width="70%">
 					<c:choose>
