Index: lams_admin/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_admin/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_admin/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_central/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_central/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_central/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_gradebook/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_gradebook/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_gradebook/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_learning/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_learning/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_learning/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
===================================================================
diff -u -r001b71e1b6da336c4adb6376c31ba95d4ace7b28 -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision 001b71e1b6da336c4adb6376c31ba95d4ace7b28)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -41,7 +41,6 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -596,11 +595,12 @@
 	responcedata.put("page", "" + 1);
 	responcedata.put("records", "" + users.size());
 
+	// data is going into a jquery UI table that doesn't need to it be escaped. LDEV-4514
 	for (User user : users) {
 	    JSONArray cell = new JSONArray();
-	    cell.put(StringEscapeUtils.escapeHtml(user.getFirstName()) + " "
-		    + StringEscapeUtils.escapeHtml(user.getLastName()) + " ["
-		    + StringEscapeUtils.escapeHtml(user.getLogin()) + "]");
+	    cell.put(new StringBuilder(user.getFirstName()).append(" ")
+		    .append(user.getLastName()).append(" (")
+		    .append(user.getLogin()) + ")").toString();
 
 	    JSONObject cellobj = new JSONObject();
 	    cellobj.put("id", "" + user.getUserId());
Index: lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_monitoring/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_assessment/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_assessment/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_assessment/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_bbb/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_bbb/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_bbb/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_chat/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_chat/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_chat/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_daco/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_daco/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_daco/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_forum/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_forum/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_forum/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_gmap/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_gmap/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_gmap/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_images/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_images/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_images/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_imscc/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_imscc/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_imscc/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_kaltura/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_kaltura/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_kaltura/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_lamc/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_lamc/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_lamc/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -rcc784a8f6f9919f02bce473b1909e919bc175604 -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision cc784a8f6f9919f02bce473b1909e919bc175604)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -158,7 +158,7 @@
 				<c:if test="${isLeadershipEnabled}">
 					<h4>
 						<fmt:message key="label.group.leader">
-							<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
+							<fmt:param><c:out value="${sessionMap.groupLeader.fullname}" escapeXml="true"/></fmt:param>
 						</fmt:message>
 					</h4>
 				</c:if>
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -rcc784a8f6f9919f02bce473b1909e919bc175604 -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision cc784a8f6f9919f02bce473b1909e919bc175604)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -54,7 +54,7 @@
 		<c:if test="${isLeadershipEnabled}">
 			<h4>
 				<fmt:message key="label.group.leader">
-					<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
+					<fmt:param><c:out value="${sessionMap.groupLeader.fullname}" escapeXml="true"/></fmt:param>
 				</fmt:message>
 			</h4>
 		</c:if>
Index: lams_tool_laqa/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_laqa/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_laqa/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_larsrc/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_larsrc/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_larsrc/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_leader/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_leader/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_leader/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_mindmap/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_mindmap/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_mindmap/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_nb/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_nb/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_nb/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_notebook/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_notebook/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_notebook/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_pixlr/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_pixlr/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_pixlr/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_sbmt/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_sbmt/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_sbmt/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_scratchie/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_scratchie/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_scratchie/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_scribe/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_scribe/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_scribe/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_spreadsheet/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_survey/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_survey/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_survey/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_task/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_task/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_task/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_vote/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_vote/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_vote/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_tool_wiki/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_tool_wiki/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_tool_wiki/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>
Index: lams_www/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u -r7af8f9e4cffe38079f5b0444a1ff9fc6733f825d -r78b448706a4b92d425c6d68add1c40d82759a6c7
--- lams_www/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 7af8f9e4cffe38079f5b0444a1ff9fc6733f825d)
+++ lams_www/web/WEB-INF/tags/LeaderDisplay.tag	(.../LeaderDisplay.tag)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
@@ -20,7 +20,7 @@
 	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
 		<div id="${idName}" class="alert alert-info leader-display">
 			<h4><fmt:message key="${messageKey}">
-				<fmt:param>${username}</fmt:param>
+				<fmt:param><c:out value="${username}" escapeXml="true"/></fmt:param>
 			</fmt:message>&nbsp;
 			<lams:Portrait userId="${userId}"/></h4>
 		</div>