Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r246391daeb0df3804fc523b4b635ebf5b0b222d0 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 246391daeb0df3804fc523b4b635ebf5b0b222d0)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -73,7 +73,7 @@
 				map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' ));
 				map.setZoom(${gmapDTO.mapZoom});
 
-				currUser = '${gmapUserDTO.firstName} ${gmapUserDTO.lastName}';
+				currUser = '<c:out value="${gmapUserDTO.firstName} ${gmapUserDTO.lastName}" escapeXml="true"/>';
 				currUserId = '${gmapUserDTO.uid}'
 				
 				// Set up map controls
@@ -88,22 +88,22 @@
 		    	
 		    	addUserToList('0',"<fmt:message key="label.authoring.basic.authored"></fmt:message>" );
 		    	<c:forEach var="user" items="${gmapSessionDTO.userDTOs}">
-		    		addUserToList('${user.uid}','${user.firstName} ${user.lastName}');
+		    		addUserToList('${user.uid}','<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>');
 		    	</c:forEach>
 		    	
 		    	<c:forEach var="marker" items="${gmapSessionDTO.markerDTOs}">
 					<c:choose>
 					<c:when test="${marker.createdBy.loginName == gmapUserDTO.loginName && marker.isAuthored == false}">
-					    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');	
+					    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/>', '${marker.createdBy.uid}');	
 						userMarkerCount ++;
 					</c:when>
 					<c:otherwise>
 						<c:choose>
 						<c:when  test="${marker.isAuthored}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, "<fmt:message key="label.authoring.basic.authored"></fmt:message>", '0' );
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true" />'), '${marker.uid}', true, false, "<fmt:message key="label.authoring.basic.authored"></fmt:message>", '0' );
 						</c:when>
 						<c:when  test="${gmapDTO.allowShowAllMarkers}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' );
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, false, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/>', '${marker.createdBy.uid}' );
 						</c:when>
 						</c:choose>
 					</c:otherwise>
Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
===================================================================
diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
+++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp	(.../mapFunctions.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -84,7 +84,7 @@
     {
     	marker.infoMessage = "";
     }
-    marker.title = title;
+    marker.title = <c:out value="title" escapeXml="true"/>;
     
     // set the state of the marker, determines how the info window will display for this marker, and the sidebar 
     marker.editingOn = !isSaved;
@@ -250,9 +250,10 @@
 		{
 			if (markers[i].createdById == users[j].id && markers[i].state != "remove" && markers[i].state != "unsaved")
 			{
+				var sideBarTitle = markers[i].title;
 				sideBarText += "&nbsp;&nbsp;&nbsp;&nbsp;<span id='markerSpan" + markers[i].sideBarIndex + "'><nobr>";
 				sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\");' ";
-				sideBarText += "title='" + markers[i].title + "' >" + markers[i].title + "</a>"
+				sideBarText += "title='" + sideBarTitle + "' >" + sideBarTitle + "</a>"
 				sideBarText += "</span></nobr><br />";
 			}
 		}
@@ -476,4 +477,4 @@
 }
 
 //-->
-</script>
\ No newline at end of file
+</script>
Index: lams_tool_gmap/web/pages/authoring/basic.jsp
===================================================================
diff -u -r8179037dc958585c054547eb7de9be14c6aed233 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 8179037dc958585c054547eb7de9be14c6aed233)
+++ lams_tool_gmap/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -89,8 +89,8 @@
 	<c:forEach var="marker" items="${formBean.gmap.gmapMarkers}">
 	addMarker(new GLatLng('${marker.latitude}', 
 		'${marker.longitude}' ), 
-		decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), 
-		decode_utf8('<c:out value="${marker.title}" />'), 
+		decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), 
+		decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), 
 		'${marker.uid}', 
 		true, 
 		true, 
Index: lams_tool_gmap/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -r246391daeb0df3804fc523b4b635ebf5b0b222d0 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision 246391daeb0df3804fc523b4b635ebf5b0b222d0)
+++ lams_tool_gmap/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -24,7 +24,7 @@
 <html>
 	<lams:head>
 	
-		<title><c:out value="${gmapDTO.title}" escapeXml="false" />
+		<title><c:out value="${gmapDTO.title}" escapeXml="true" />
 		</title>
 		<lams:css localLinkPath="../" />
 		
@@ -105,7 +105,7 @@
 			<div id="content">
 
 			<h1>
-				<c:out value="${gmapDTO.title}" escapeXml="false" />
+				<c:out value="${gmapDTO.title}" escapeXml="true" />
 			</h1>
 
 			<p>
@@ -184,11 +184,11 @@
 					<c:forEach var="user" items="${session.userDTOs}">
 						<tr>
 							<td width="15%">
-								<span style="font-weight: bold">${user.firstName} ${user.lastName}</span>
+								<span style="font-weight: bold"><c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/></span>
 							</td>
 							<td width="85%">
 								<c:if test="${user.finishedReflection}">
-									${user.notebookEntry}
+									<lams:out value="${user.notebookEntry}" escapeHtml="true"/>
 								</c:if>
 							</td>
 						</tr>	
@@ -203,10 +203,9 @@
 					<br /><br />
 					<h1><fmt:message key="heading.reflection"></fmt:message></h1>
 					<p>
-						<span style="font-weight: bold">${gmapUserDTO.firstName}
-							${gmapUserDTO.lastName} </span>
+						<span style="font-weight: bold"><c:out value="${gmapUserDTO.firstName} ${gmapUserDTO.lastName}" escapeXml="true"/> </span>
 						<br />
-						<lams:out value="${gmapUserDTO.notebookEntry}"/>
+						<lams:out value="${gmapUserDTO.notebookEntry}" escapeHtml="true"/>
 					</p>
 				</c:if>
 			</c:otherwise>
@@ -232,7 +231,7 @@
 			{
 				addUserToList('0',"<fmt:message key="label.authoring.basic.authored"></fmt:message>" );
 				<c:forEach var="user" items="${session.userDTOs}">
-					addUserToList('${user.uid}','${user.firstName} ${user.lastName}' );
+					addUserToList('${user.uid}','<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>' );
 				</c:forEach>
 			}
 			
@@ -241,10 +240,10 @@
 				<c:forEach var="marker" items="${session.markerDTOs}">
 					<c:choose>
 					<c:when test="${marker.isAuthored == true}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, false, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/> (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
 					</c:when>
 					<c:otherwise>
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, false, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/>', '${marker.createdBy.uid}');
 					</c:otherwise>
 				</c:choose>
 				</c:forEach>
@@ -270,12 +269,12 @@
 			<c:forEach var="marker" items="${gmapDTO.gmapMarkers}">							
 				<c:choose>
 					<c:when test="${marker.isAuthored == true}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, false, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/> (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
 					</c:when>
 					<c:otherwise>
 						<c:choose>
 							<c:when test="${gmapDTO.allowShowAllMarkers == true || marker.createdBy.loginName == gmapUserDTO.loginName}">
-								addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');
+								addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, false, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/>', '${marker.createdBy.uid}');
 							</c:when>
 						</c:choose>
 					</c:otherwise>
Index: lams_tool_gmap/web/pages/learning/gmap.jsp
===================================================================
diff -u -r941ce68be457b4cb4fcf2d830a44a9361f6f5370 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision 941ce68be457b4cb4fcf2d830a44a9361f6f5370)
+++ lams_tool_gmap/web/pages/learning/gmap.jsp	(.../gmap.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -20,12 +20,12 @@
 
 <div id="content">
 	<h1>
-		${gmapDTO.title}
+		<c:out value="${gmapDTO.title}" escapeXml="true"/>
 	</h1>
 
 	
 	<p>
-		${gmapDTO.instructions}
+		<c:out value="${gmapDTO.instructions}" escapeXml="false"/>
 	</p>
 
 	<br />
Index: lams_tool_gmap/web/pages/learning/notebook.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_gmap/web/pages/learning/notebook.jsp	(.../notebook.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -27,7 +27,7 @@
 			<div id="content">
 			
 			<h1>
-				${gmapDTO.title}
+				<c:out value="${gmapDTO.title}" escapeXml="true"/>
 			</h1>
 		
 			<html:form action="/learning" method="post">
@@ -36,7 +36,7 @@
 				<html:hidden property="mode" value="${mode}" />
 				
 				<p class="small-space-top">
-					<lams:out value="${gmapDTO.reflectInstructions}" />
+					<lams:out value="${gmapDTO.reflectInstructions}" escapeHtml="true"/>
 				</p>
 		
 				<html:textarea cols="60" rows="8" property="entryText"
Index: lams_tool_gmap/web/pages/learning/parts/finishButton.jsp
===================================================================
diff -u -r8aded0b18a5a7712622ae56f38923fa297449977 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision 8aded0b18a5a7712622ae56f38923fa297449977)
+++ lams_tool_gmap/web/pages/learning/parts/finishButton.jsp	(.../finishButton.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -17,7 +17,7 @@
 	<html:hidden property="markersXML" value="" />
 		<div class="space-top">
 			<h2>
-				${gmapDTO.reflectInstructions}
+				<lams:out value="${gmapDTO.reflectInstructions}" escapeHtml="true"/>
 			</h2>
 
 			<p>
@@ -72,4 +72,4 @@
 			</c:otherwise>
 		</c:choose>
 	</div>
-</html:form>
\ No newline at end of file
+</html:form>
Index: lams_tool_gmap/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision 3299d560146318cb6f26ec2b234e3af70ec21eba)
+++ lams_tool_gmap/web/pages/monitoring/editActivity.jsp	(.../editActivity.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -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_gmap/web/pages/monitoring/notebook.jsp
===================================================================
diff -u -r74b71c544bb3970571e885fd2e56fb22c9880f19 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision 74b71c544bb3970571e885fd2e56fb22c9880f19)
+++ lams_tool_gmap/web/pages/monitoring/notebook.jsp	(.../notebook.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -34,14 +34,14 @@
 					<tr>
 						<td>
 							<h2>
-								${gmapUserDTO.firstName} ${gmapUserDTO.lastName}
+								<c:out value="${gmapUserDTO.firstName} ${gmapUserDTO.lastName}" escapeXml="true"/>
 							</h2>
 						</td>
 					</tr>
 					<tr>
 						<td>
 							<p>
-								<lams:out value="${gmapUserDTO.notebookEntry}" />
+								<lams:out value="${gmapUserDTO.notebookEntry}" escapeHtml="true"/>
 							</p>
 						</td>
 					</tr>
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r714b9e7b785b4cc6b7a37e56938c0858f74138a5 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 714b9e7b785b4cc6b7a37e56938c0858f74138a5)
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -169,7 +169,7 @@
 					<fmt:message key="monitor.summary.td.notebookInstructions" />
 				</td>
 				<td>
-					${dto.reflectInstructions}	
+					<lams:out value="${dto.reflectInstructions}" escapeHtml="true"/>
 				</td>
 			</tr>
 		</c:when>
@@ -273,7 +273,7 @@
 		<c:forEach var="user" items="${session.userDTOs}">
 			<tr>
 				<td>
-					${user.firstName} ${user.lastName}
+					<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>
 				</td>
 				<td>
 					<c:if test="${user.finishedReflection}">
@@ -320,10 +320,10 @@
 		<c:forEach var="marker" items="${session.markerDTOs}">
 			<c:choose>
 			<c:when test="${marker.isAuthored == true}">
-				addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, true, '${marker.createdBy.firstName} ${marker.createdBy.lastName} (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
+				addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, true, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/> (<fmt:message key="label.authoring.basic.authored"></fmt:message>)', '0');
 			</c:when>
 			<c:otherwise>
-				addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, true, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');
+				addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, true, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}"escapeXml="true"/>', '${marker.createdBy.uid}');
 			</c:otherwise>
 		</c:choose>
 		</c:forEach>