Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_learning/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,16 +1,20 @@
 <%@ include file="/common/taglibs.jsp"%>
+
 <script type="text/javascript">
 	<!--
 	function masterDetailLoadUp(){
 			jQuery("#userSummary${assessmentResult.sessionId}").clearGridData().setGridParam({scrollOffset: 18});
  	        <c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
 	       		<c:set var="question" value="${questionResult.assessmentQuestion}"/>
+	       		<c:set var="title">
+	       			<c:out value="${questionResult.assessmentQuestion.titleEscaped}" escapeXml="true"/>
+	       		</c:set>	
  	        	var responseStr = "";
  	       		<%@ include file="userresponse.jsp"%>
  	     		jQuery("#userSummary${assessmentResult.sessionId}").addRowData(${i.index + 1}, {
  	   	     		id:"${i.index + 1}",
  	   	   			questionResultUid:"${questionResult.uid}",
- 	   	   			title:"${questionResult.assessmentQuestion.titleEscaped}",
+ 	   	   			title:"${title}",
  	   	   			response:responseStr,
  	   	   			grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
  	   	   	    });	
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r786019a76827689001e89a94f86a3b5fce16ca97 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 786019a76827689001e89a94f86a3b5fce16ca97)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -192,10 +192,12 @@
 
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
+<h1><c:out value="${assessment.title}" escapeXml="true"/></h1>
 
-<%@ include file="parts/advanceoptions.jsp"%>
+<div class="instructions space-top">
+	<c:out value="${assessment.instructions}" escapeXml="false"/>
+</div>
 
-<%@ include file="parts/dateRestriction.jsp"%>
 
 <c:choose>
 	<c:when test="${empty summaryList}">
@@ -263,3 +265,9 @@
 	
 	</c:otherwise>
 </c:choose>
+
+<br/>
+
+<%@ include file="parts/advanceoptions.jsp"%>
+
+<%@ include file="parts/dateRestriction.jsp"%>
Index: lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_laqa/web/monitoring/Reflections.jsp
===================================================================
diff -u -r55acfa2355b842ad87bac70171e366e088daad3c -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
+++ lams_tool_laqa/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -13,7 +13,8 @@
 			<td valign=top class="align-left">
 				<c:out value="${reflectDTO.userName}" escapeXml="true"/> <lams:Date value="${reflectDTO.date}"/>
 				<br>
-				<lams:out value="${reflectDTO.entry}" escapeHtml="true" />
+				<c:out value="${reflectDTO.entry}" escapeXml="true"/>
+
 			</td>
 		</tr>	
 	</c:forEach>
Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_leader/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 17ddd3aac11d9fecc83159a9c829e989754accfb)
+++ lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520)
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394
--- lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>