Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r7e26cc267b556ce7f7b2116b13a9afe02f353d74 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 7e26cc267b556ce7f7b2116b13a9afe02f353d74)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -31,17 +31,18 @@
 			CANVAS_RESIZE_OPTION_NONE = 0,
 			CANVAS_RESIZE_OPTION_FIT = 1,
 			CANVAS_RESIZE_OPTION_FULL = 2,
-			CANVAS_RESIZE_LABEL_FULL = '<fmt:message key="label.tab.lesson.size.full" />',
-			CANVAS_RESIZE_LABEL_FIT = '<fmt:message key="label.tab.lesson.size.fit" />',
+			CANVAS_RESIZE_LABEL_FULL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tab.lesson.size.full' /></spring:escapeBody>";
+			CANVAS_RESIZE_LABEL_FIT = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tab.lesson.size.fit' /></spring:escapeBody>";
 
-			SPLIT_LEARNERS_DESCRIPTION = '<fmt:message key="label.tab.advanced.split.desc" />',
-			LABEL_MISSING_LEARNERS = '<fmt:message key="error.tab.class.learners" />',
-			LABEL_MISSING_MONITORS = '<fmt:message key="error.tab.class.monitors" />',
-			LABEL_RUN_SEQUENCES_FOLDER = '<fmt:message key="label.tab.lesson.sequence.folder" />',
-			LABEL_NAME_INVALID_CHARACTERS = '<fmt:message key="error.lessonname.invalid.characters" />',
-			LABEL_PREVIEW_LESSON_DEFAULT_TITLE = '<fmt:message key="authoring.fla.preview.lesson.default.title" />',
-			LABEL_PREVIEW_ERROR = '<fmt:message key="authoring.fla.preview.error" />';
-			LABEL_ORG_GROUPING_DIALOG_TITLE = '<fmt:message key="label.course.groups.viewonly.title" />';
+			SPLIT_LEARNERS_DESCRIPTION = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tab.advanced.split.desc' /></spring:escapeBody>";
+			LABEL_MISSING_LEARNERS = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.tab.class.learners' /></spring:escapeBody>";
+			LABEL_MISSING_MONITORS = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.tab.class.monitors' /></spring:escapeBody>";
+			LABEL_RUN_SEQUENCES_FOLDER = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.tab.lesson.sequence.folder' /></spring:escapeBody>";
+			LABEL_NAME_INVALID_CHARACTERS = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.lessonname.invalid.characters' /></spring:escapeBody>";
+			LABEL_PREVIEW_LESSON_DEFAULT_TITLE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='authoring.fla.preview.lesson.default.title' /></spring:escapeBody>";
+			LABEL_PREVIEW_ERROR = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='authoring.fla.preview.error' /></spring:escapeBody>";
+			LABEL_ORG_GROUPING_DIALOG_TITLE = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.course.groups.viewonly.title' /></spring:escapeBody>";
+
 			
  		$(document).ready(function(){
 			initLessonTab();
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -23,255 +23,253 @@
 		var LAMS_URL = '<lams:LAMSURL/>',
 			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
 
-			decoderDiv = $('<div />'),
 			LABELS = {
 				// ActivityLib
 				<fmt:message key="authoring.fla.default.group.title" var="DEFAULT_GROUPING_TITLE_VAR"/>
-				DEFAULT_GROUPING_TITLE : '<c:out value="${DEFAULT_GROUPING_TITLE_VAR}" />',
+				DEFAULT_GROUPING_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_GROUPING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.group.prefix" var="DEFAULT_GROUP_PREFIX_VAR"/>
-				DEFAULT_GROUP_PREFIX : '<c:out value="${DEFAULT_GROUP_PREFIX_VAR}" />',
+				DEFAULT_GROUP_PREFIX : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_GROUP_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.branching.title" var="DEFAULT_BRANCHING_TITLE_VAR"/>
-				DEFAULT_BRANCHING_TITLE : '<c:out value="${DEFAULT_BRANCHING_TITLE_VAR}" />',
+				DEFAULT_BRANCHING_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_BRANCHING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.branch.prefix" var="DEFAULT_BRANCH_PREFIX_VAR"/>
-				DEFAULT_BRANCH_PREFIX : '<c:out value="${DEFAULT_BRANCH_PREFIX_VAR}" />',
+				DEFAULT_BRANCH_PREFIX : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_BRANCH_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.optional.activity.title" var="DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR"/>
-				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<c:out value="${DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR}" />',
+				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.support.activity.title" var="SUPPORT_ACTIVITY_TITLE_VAR"/>
-				SUPPORT_ACTIVITY_TITLE : '<c:out value="${SUPPORT_ACTIVITY_TITLE_VAR}" />',
+				SUPPORT_ACTIVITY_TITLE : '<spring:escapeBody javaScriptEscape="true">${SUPPORT_ACTIVITY_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.gate.activity.label" var="GATE_ACTIVITY_LABEL_VAR"/>
-				GATE_ACTIVITY_LABEL : '<c:out value="${GATE_ACTIVITY_LABEL_VAR}" />',
+				GATE_ACTIVITY_LABEL : '<spring:escapeBody javaScriptEscape="true">${GATE_ACTIVITY_LABEL_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branching.start.suffix" var="BRANCHING_START_SUFFIX_VAR"/>
-				BRANCHING_START_SUFFIX : '<c:out value="${BRANCHING_START_SUFFIX_VAR}" />',
+				BRANCHING_START_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BRANCHING_START_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branching.end.suffix" var="BRANCHING_END_SUFFIX_VAR"/>
-				BRANCHING_END_SUFFIX : '<c:out value="${BRANCHING_END_SUFFIX_VAR}" />',
+				BRANCHING_END_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BRANCHING_END_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.activity.dialog.title.suffix" var="ACTIVITY_DIALOG_TITLE_SUFFIX_VAR"/>
-				ACTIVITY_DIALOG_TITLE_SUFFIX : '<c:out value="${ACTIVITY_DIALOG_TITLE_SUFFIX_VAR}" />',
+				ACTIVITY_DIALOG_TITLE_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${ACTIVITY_DIALOG_TITLE_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.remove.activity.confirm" var="REMOVE_ACTIVITY_CONFIRM_VAR"/>
-				REMOVE_ACTIVITY_CONFIRM : decoderDiv.html('<c:out value="${REMOVE_ACTIVITY_CONFIRM_VAR}" />').text(),
+				REMOVE_ACTIVITY_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${REMOVE_ACTIVITY_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branching.create.confirm" var="BRANCHING_CREATE_CONFIRM_VAR"/>
-				BRANCHING_CREATE_CONFIRM : decoderDiv.html('<c:out value="${BRANCHING_CREATE_CONFIRM_VAR}" />').text(),
+				BRANCHING_CREATE_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${BRANCHING_CREATE_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.transition.to.exists.error" var="TRANSITION_TO_EXISTS_ERROR_VAR"/>
-				TRANSITION_TO_EXISTS_ERROR : decoderDiv.html('<c:out value="${TRANSITION_TO_EXISTS_ERROR_VAR}" />').text(),
+				TRANSITION_TO_EXISTS_ERROR : '<spring:escapeBody javaScriptEscape="true">${TRANSITION_TO_EXISTS_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.circular.sequence.error" var="CIRCULAR_SEQUENCE_ERROR_VAR"/>
-				CIRCULAR_SEQUENCE_ERROR : decoderDiv.html('<c:out value="${CIRCULAR_SEQUENCE_ERROR_VAR}" />').text(),
+				CIRCULAR_SEQUENCE_ERROR : '<spring:escapeBody javaScriptEscape="true">${CIRCULAR_SEQUENCE_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.activity.in.container.error" var="ACTIVITY_IN_CONTAINER_ERROR_VAR"/>
-				ACTIVITY_IN_CONTAINER_ERROR : decoderDiv.html('<c:out value="${ACTIVITY_IN_CONTAINER_ERROR_VAR}" />').text(),
+				ACTIVITY_IN_CONTAINER_ERROR : '<spring:escapeBody javaScriptEscape="true">${ACTIVITY_IN_CONTAINER_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.readonly.activity.error" var="LIVEEDIT_READONLY_ACTIVITY_ERROR_VAR"/>
-				LIVEEDIT_READONLY_ACTIVITY_ERROR : '<c:out value="${LIVEEDIT_READONLY_ACTIVITY_ERROR_VAR}" />',
+				LIVEEDIT_READONLY_ACTIVITY_ERROR : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_READONLY_ACTIVITY_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.readonly.move.parent.error" var="LIVEEDIT_READONLY_MOVE_PARENT_ERROR_VAR"/>
-				LIVEEDIT_READONLY_MOVE_PARENT_ERROR : '<c:out value="${LIVEEDIT_READONLY_MOVE_PARENT_ERROR_VAR}" />',
+				LIVEEDIT_READONLY_MOVE_PARENT_ERROR : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_READONLY_MOVE_PARENT_ERROR_VAR}</spring:escapeBody>',
 				
 				
 				// DecorationLib
 				<fmt:message key="authoring.fla.default.annotation.label.title" var="DEFAULT_ANNOTATION_LABEL_TITLE_VAR"/>
-				DEFAULT_ANNOTATION_LABEL_TITLE : '<c:out value="${DEFAULT_ANNOTATION_LABEL_TITLE_VAR}" />',
+				DEFAULT_ANNOTATION_LABEL_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_ANNOTATION_LABEL_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.region.fit.button.tooltip" var="REGION_FIT_BUTTON_TOOLTIP_VAR"/>
-				REGION_FIT_BUTTON_TOOLTIP : '<c:out value="${REGION_FIT_BUTTON_TOOLTIP_VAR}" />',
-				
+				REGION_FIT_BUTTON_TOOLTIP : '<spring:escapeBody javaScriptEscape="true">${REGION_FIT_BUTTON_TOOLTIP_VAR}</spring:escapeBody>',
+
 				// General
 				<fmt:message key="authoring.fla.folder" var="FOLDER_VAR"/>
-				FOLDER : '<c:out value="${FOLDER_VAR}" />',
+				FOLDER : '<spring:escapeBody javaScriptEscape="true">${FOLDER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence" var="SEQUENCE_VAR"/>
-				SEQUENCE : '<c:out value="${SEQUENCE_VAR}" />',
+				SEQUENCE : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.weights.title" var="WEIGHTS_TITLE_VAR"/>
-				WEIGHTS_TITLE : '<c:out value="${WEIGHTS_TITLE_VAR}" />',
+				WEIGHTS_TITLE : '<spring:escapeBody javaScriptEscape="true">${WEIGHTS_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence.not.valid" var="SEQUENCE_NOT_VALID_VAR"/>
-				SEQUENCE_NOT_VALID : decoderDiv.html('<c:out value="${SEQUENCE_NOT_VALID_VAR}" />').text(),
+				SEQUENCE_NOT_VALID : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_NOT_VALID_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence.validation.issues" var="SEQUENCE_VALIDATION_ISSUES_VAR"/>
-				SEQUENCE_VALIDATION_ISSUES : '<c:out value="${SEQUENCE_VALIDATION_ISSUES_VAR}" />',
+				SEQUENCE_VALIDATION_ISSUES : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_VALIDATION_ISSUES_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.save.successful" var="SAVE_SUCCESSFUL_VAR"/>
-				SAVE_SUCCESSFUL : decoderDiv.html('<c:out value="${SAVE_SUCCESSFUL_VAR}" />').text(),
+				SAVE_SUCCESSFUL : '<spring:escapeBody javaScriptEscape="true">${SAVE_SUCCESSFUL_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.save.successful.check.grouping" var="SAVE_SUCCESSFUL_CHECK_GROUPING_VAR"/>
-				SAVE_SUCCESSFUL_CHECK_GROUPING : decoderDiv.html('<c:out value="${SAVE_SUCCESSFUL_CHECK_GROUPING_VAR}" />').text(),
+				SAVE_SUCCESSFUL_CHECK_GROUPING : '<spring:escapeBody javaScriptEscape="true">${SAVE_SUCCESSFUL_CHECK_GROUPING_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.save.successful" var="LIVEEDIT_SAVE_SUCCESSFUL_VAR"/>
-				LIVEEDIT_SAVE_SUCCESSFUL : decoderDiv.html('<c:out value="${LIVEEDIT_SAVE_SUCCESSFUL_VAR}" />').text(),
+				LIVEEDIT_SAVE_SUCCESSFUL : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_SAVE_SUCCESSFUL_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.delete.node.confirm" var="DELETE_NODE_CONFIRM_VAR"/>
-				DELETE_NODE_CONFIRM : decoderDiv.html('<c:out value="${DELETE_NODE_CONFIRM_VAR}" />').text(),
+				DELETE_NODE_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${DELETE_NODE_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence.overwrite.confirm" var="SEQUENCE_OVERWRITE_CONFIRM_VAR"/>
-				SEQUENCE_OVERWRITE_CONFIRM : decoderDiv.html('<c:out value="${SEQUENCE_OVERWRITE_CONFIRM_VAR}" />').text(),
+				SEQUENCE_OVERWRITE_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_OVERWRITE_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.new.folder.title.prompt" var="NEW_FOLDER_TITLE_PROMPT_VAR"/>
-				NEW_FOLDER_TITLE_PROMPT : decoderDiv.html('<c:out value="${NEW_FOLDER_TITLE_PROMPT_VAR}" />').text(),
+				NEW_FOLDER_TITLE_PROMPT : '<spring:escapeBody javaScriptEscape="true">${NEW_FOLDER_TITLE_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.rename.title.prompt" var="RENAME_TITLE_PROMPT_VAR"/>
-				RENAME_TITLE_PROMPT : decoderDiv.html('<c:out value="${RENAME_TITLE_PROMPT_VAR}" />').text(),
+				RENAME_TITLE_PROMPT : '<spring:escapeBody javaScriptEscape="true">${RENAME_TITLE_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.save.sequence.title.prompt" var="SAVE_SEQUENCE_TITLE_PROMPT_VAR"/>
-				SAVE_SEQUENCE_TITLE_PROMPT : decoderDiv.html('<c:out value="${SAVE_SEQUENCE_TITLE_PROMPT_VAR}" />').text(),
+				SAVE_SEQUENCE_TITLE_PROMPT : '<spring:escapeBody javaScriptEscape="true">${SAVE_SEQUENCE_TITLE_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.import.part.choose.prompt" var="IMPORT_PART_CHOOSE_PROMPT_VAR"/>
-				IMPORT_PART_CHOOSE_PROMPT : decoderDiv.html('<c:out value="${IMPORT_PART_CHOOSE_PROMPT_VAR}" />').text(),
+				IMPORT_PART_CHOOSE_PROMPT : '<spring:escapeBody javaScriptEscape="true">${IMPORT_PART_CHOOSE_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.cancel.confirm" var="LIVEEDIT_CANCEL_CONFIRM_VAR"/>
-				LIVEEDIT_CANCEL_CONFIRM : '<c:out value="${LIVEEDIT_CANCEL_CONFIRM_VAR}" />',
+				LIVEEDIT_CANCEL_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_CANCEL_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.replace.question.prompt" var="REPLACE_QUESTION_PROMPT_VAR"/>
-				REPLACE_QUESTION_PROMPT : decoderDiv.html('<c:out value="${REPLACE_QUESTION_PROMPT_VAR}" />').text(),
+				REPLACE_QUESTION_PROMPT : '<spring:escapeBody javaScriptEscape="true">${REPLACE_QUESTION_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.folder.not.selected.error" var="FOLDER_NOT_SELECTED_ERROR_VAR"/>
-				FOLDER_NOT_SELECTED_ERROR : decoderDiv.html('<c:out value="${FOLDER_NOT_SELECTED_ERROR_VAR}" />').text(),
+				FOLDER_NOT_SELECTED_ERROR : '<spring:escapeBody javaScriptEscape="true">${FOLDER_NOT_SELECTED_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.folder.can.not.save.error" var="FOLDER_CAN_NOT_SAVE_ERROR_VAR"/>
-				FOLDER_CAN_NOT_SAVE_ERROR : decoderDiv.html('<c:out value="${FOLDER_CAN_NOT_SAVE_ERROR_VAR}" />').text(),
+				FOLDER_CAN_NOT_SAVE_ERROR : '<spring:escapeBody javaScriptEscape="true">${FOLDER_CAN_NOT_SAVE_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.title.validation.error" var="TITLE_VALIDATION_ERROR_VAR"/>
-				TITLE_VALIDATION_ERROR : decoderDiv.html('<c:out value="${TITLE_VALIDATION_ERROR_VAR}" />').text(),
+				TITLE_VALIDATION_ERROR : '<spring:escapeBody javaScriptEscape="true">${TITLE_VALIDATION_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.folder.exists.error" var="FOLDER_EXISTS_ERROR_VAR"/>
-				FOLDER_EXISTS_ERROR : decoderDiv.html('<c:out value="${FOLDER_EXISTS_ERROR_VAR}" />').text(),
+				FOLDER_EXISTS_ERROR : '<spring:escapeBody javaScriptEscape="true">${FOLDER_EXISTS_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence.exists.error" var="SEQUENCE_EXISTS_ERROR_VAR"/>
-				SEQUENCE_EXISTS_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_EXISTS_ERROR_VAR}" />').text(),
+				SEQUENCE_EXISTS_ERROR : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_EXISTS_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence.save.error" var="SEQUENCE_SAVE_ERROR_VAR"/>
-				SEQUENCE_SAVE_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_SAVE_ERROR_VAR}" />').text(),
+				SEQUENCE_SAVE_ERROR : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_SAVE_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.readonly.forbidden" var="READONLY_FORBIDDEN_ERROR_VAR"/>
-				READONLY_FORBIDDEN_ERROR : decoderDiv.html('<c:out value="${READONLY_FORBIDDEN_ERROR_VAR}" />').text(),
+				READONLY_FORBIDDEN_ERROR : '<spring:escapeBody javaScriptEscape="true">${READONLY_FORBIDDEN_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.svg.save.error" var="SVG_SAVE_ERROR_VAR"/>
-				SVG_SAVE_ERROR : decoderDiv.html('<c:out value="${SVG_SAVE_ERROR_VAR}" />').text(),
+				SVG_SAVE_ERROR : '<spring:escapeBody javaScriptEscape="true">${SVG_SAVE_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence.not.selected.error" var="SEQUENCE_NOT_SELECTED_ERROR_VAR"/>
-				SEQUENCE_NOT_SELECTED_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_NOT_SELECTED_ERROR_VAR}" />').text(),
+				SEQUENCE_NOT_SELECTED_ERROR : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_NOT_SELECTED_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.sequence.load.error" var="SEQUENCE_LOAD_ERROR_VAR"/>
-				SEQUENCE_LOAD_ERROR : decoderDiv.html('<c:out value="${SEQUENCE_LOAD_ERROR_VAR}" />').text(),
+				SEQUENCE_LOAD_ERROR : '<spring:escapeBody javaScriptEscape="true">${SEQUENCE_LOAD_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.modify.error" var="RESOURCE_MODIFY_ERROR_VAR"/>
-				RESOURCE_MODIFY_ERROR : decoderDiv.html('<c:out value="${RESOURCE_MODIFY_ERROR_VAR}" />').text(),
+				RESOURCE_MODIFY_ERROR : '<spring:escapeBody javaScriptEscape="true">${RESOURCE_MODIFY_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.folder.move.to.child.error" var="FOLDER_MOVE_TO_CHILD_ERROR_VAR"/>
-				FOLDER_MOVE_TO_CHILD_ERROR : decoderDiv.html('<c:out value="${FOLDER_MOVE_TO_CHILD_ERROR_VAR}" />').text(),
+				FOLDER_MOVE_TO_CHILD_ERROR : '<spring:escapeBody javaScriptEscape="true">${FOLDER_MOVE_TO_CHILD_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.weights.sum.error" var="WEIGHTS_SUM_ERROR_VAR"/>
-				WEIGHTS_SUM_ERROR : decoderDiv.html('<c:out value="${WEIGHTS_SUM_ERROR_VAR}" />').text(),
+				WEIGHTS_SUM_ERROR : '<spring:escapeBody javaScriptEscape="true">${WEIGHTS_SUM_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.weights.none" var="WEIGHTS_NONE_FOUND_ERROR_VAR"/>
-				WEIGHTS_NONE_FOUND_ERROR : decoderDiv.html('<c:out value="${WEIGHTS_NONE_FOUND_ERROR_VAR}" />').text(),
+				WEIGHTS_NONE_FOUND_ERROR : '<spring:escapeBody javaScriptEscape="true">${WEIGHTS_NONE_FOUND_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.grouping.detached.error" var="GROUPING_DETACHED_ERROR_VAR"/>
-				GROUPING_DETACHED_ERROR : decoderDiv.html('<c:out value="${GROUPING_DETACHED_ERROR_VAR}" />').text(),
+				GROUPING_DETACHED_ERROR : '<spring:escapeBody javaScriptEscape="true">${GROUPING_DETACHED_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.input.detached.error" var="INPUT_DETACHED_ERROR_VAR"/>
-				INPUT_DETACHED_ERROR : decoderDiv.html('<c:out value="${INPUT_DETACHED_ERROR_VAR}" />').text(),
+				INPUT_DETACHED_ERROR : '<spring:escapeBody javaScriptEscape="true">${INPUT_DETACHED_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.learning.design.templates" var="TEMPLATES_VAR"/>
-				TEMPLATES : decoderDiv.html('<c:out value="${TEMPLATES_VAR}" />').text(),
+				TEMPLATES : '<spring:escapeBody javaScriptEscape="true">${TEMPLATES_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.page.menu.apply.changes" var="LIVE_EDIT_SAVE_VAR"/>
-				LIVE_EDIT_SAVE : decoderDiv.html('<c:out value="${LIVE_EDIT_SAVE_VAR}" />').text(),
+				LIVE_EDIT_SAVE : '<spring:escapeBody javaScriptEscape="true">${LIVE_EDIT_SAVE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
-				NAVIGATE_AWAY_CONFIRM : decoderDiv.html('<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />').text(),
+				NAVIGATE_AWAY_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${NAVIGATE_AWAY_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.remove.button.confirm" var="REMOVE_BUTTON_CONFIRM_VAR"/>
-				REMOVE_BUTTON_CONFIRM : decoderDiv.html('<c:out value="${REMOVE_BUTTON_CONFIRM_VAR}" />').text(),
+				REMOVE_BUTTON_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${REMOVE_BUTTON_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.remove.button.tip" var="REMOVE_BUTTON_TOOLTIP_VAR"/>
-				REMOVE_BUTTON_TOOLTIP : decoderDiv.html('<c:out value="${REMOVE_BUTTON_TOOLTIP_VAR}" />').text(),
-				
+				REMOVE_BUTTON_TOOLTIP : '<spring:escapeBody javaScriptEscape="true">${REMOVE_BUTTON_TOOLTIP_VAR}</spring:escapeBody>',
+
 				// HandlerLib
 				<fmt:message key="authoring.fla.transition.from.exists.error" var="TRANSITION_FROM_EXISTS_ERROR_VAR"/>
-				TRANSITION_FROM_EXISTS_ERROR : decoderDiv.html('<c:out value="${TRANSITION_FROM_EXISTS_ERROR_VAR}" />').text(),
+				TRANSITION_FROM_EXISTS_ERROR : '<spring:escapeBody javaScriptEscape="true">${TRANSITION_FROM_EXISTS_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.readonly.remove.activity.error" var="LIVEEDIT_REMOVE_ACTIVITY_ERROR_VAR"/>
-				LIVEEDIT_REMOVE_ACTIVITY_ERROR : '<c:out value="${LIVEEDIT_REMOVE_ACTIVITY_ERROR_VAR}" />',
+				LIVEEDIT_REMOVE_ACTIVITY_ERROR : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_REMOVE_ACTIVITY_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.readonly.remove.parent.error" var="LIVEEDIT_REMOVE_PARENT_ERROR_VAR"/>
-				LIVEEDIT_REMOVE_PARENT_ERROR : '<c:out value="${LIVEEDIT_REMOVE_PARENT_ERROR_VAR}" />',
+				LIVEEDIT_REMOVE_PARENT_ERROR : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_REMOVE_PARENT_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.readonly.remove.child.error" var="LIVEEDIT_REMOVE_CHILD_ERROR_VAR"/>
-				LIVEEDIT_REMOVE_CHILD_ERROR : '<c:out value="${LIVEEDIT_REMOVE_CHILD_ERROR_VAR}" />',
+				LIVEEDIT_REMOVE_CHILD_ERROR : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_REMOVE_CHILD_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.liveedit.readonly.remove.transition.error" var="LIVEEDIT_REMOVE_TRANSITION_ERROR_VAR"/>
-				LIVEEDIT_REMOVE_TRANSITION_ERROR : '<c:out value="${LIVEEDIT_REMOVE_TRANSITION_ERROR_VAR}" />',
-					
+				LIVEEDIT_REMOVE_TRANSITION_ERROR : '<spring:escapeBody javaScriptEscape="true">${LIVEEDIT_REMOVE_TRANSITION_ERROR_VAR}</spring:escapeBody>',
+
 				// MenuLib
 				<fmt:message key="authoring.fla.export.sequence.dialog.title" var="EXPORT_SEQUENCE_DIALOG_TITLE_VAR"/>
-				EXPORT_SEQUENCE_DIALOG_TITLE : '<c:out value="${EXPORT_SEQUENCE_DIALOG_TITLE_VAR}" />',
+				EXPORT_SEQUENCE_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${EXPORT_SEQUENCE_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.activity.copy.title.prefix" var="ACTIVITY_COPY_TITLE_PREFIX_VAR"/>
-				ACTIVITY_COPY_TITLE_PREFIX : '<c:out value="${ACTIVITY_COPY_TITLE_PREFIX_VAR}" />',
+				ACTIVITY_COPY_TITLE_PREFIX : '<spring:escapeBody javaScriptEscape="true">${ACTIVITY_COPY_TITLE_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.preview.lesson.default.title" var="PREVIEW_LESSON_DEFAULT_TITLE_VAR"/>
-				PREVIEW_LESSON_DEFAULT_TITLE : '<c:out value="${PREVIEW_LESSON_DEFAULT_TITLE_VAR}" />',
+				PREVIEW_LESSON_DEFAULT_TITLE : '<spring:escapeBody javaScriptEscape="true">${PREVIEW_LESSON_DEFAULT_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.save.dialog.title" var="SAVE_DIALOG_TITLE_VAR"/>
-				SAVE_DIALOG_TITLE : '<c:out value="${SAVE_DIALOG_TITLE_VAR}" />',
+				SAVE_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${SAVE_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.open.dialog.title" var="OPEN_DIALOG_TITLE_VAR"/>
-				OPEN_DIALOG_TITLE : '<c:out value="${OPEN_DIALOG_TITLE_VAR}" />',
+				OPEN_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${OPEN_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.import.dialog.title" var="IMPORT_DIALOG_TITLE_VAR"/>
-				IMPORT_DIALOG_TITLE : '<c:out value="${IMPORT_DIALOG_TITLE_VAR}" />',
+				IMPORT_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${IMPORT_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.import.part.dialog.title" var="IMPORT_PART_DIALOG_TITLE_VAR"/>
-				IMPORT_PART_DIALOG_TITLE : '<c:out value="${IMPORT_PART_DIALOG_TITLE_VAR}" />',
+				IMPORT_PART_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${IMPORT_PART_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="label.tab.lesson.sequence.folder" var="RUN_SEQUENCES_FOLDER_VAR"/>
-				RUN_SEQUENCES_FOLDER : '<c:out value="${RUN_SEQUENCES_FOLDER_VAR}" />',
+				RUN_SEQUENCES_FOLDER : '<spring:escapeBody javaScriptEscape="true">${RUN_SEQUENCES_FOLDER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.arrange.confirm" var="ARRANGE_CONFIRM_VAR"/>
-				ARRANGE_CONFIRM : decoderDiv.html('<c:out value="${ARRANGE_CONFIRM_VAR}" />').text(),
+				ARRANGE_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${ARRANGE_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.clear.canvas.confirm" var="CLEAR_CANVAS_CONFIRM_VAR"/>
-				CLEAR_CANVAS_CONFIRM : decoderDiv.html('<c:out value="${CLEAR_CANVAS_CONFIRM_VAR}" />').text(),
+				CLEAR_CANVAS_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${CLEAR_CANVAS_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.annotation.region.place.prompt" var="ANNOTATION_REGION_PLACE_PROMPT_VAR"/>
-				ANNOTATION_REGION_PLACE_PROMPT : decoderDiv.html('<c:out value="${ANNOTATION_REGION_PLACE_PROMPT_VAR}" />').text(),
+				ANNOTATION_REGION_PLACE_PROMPT : '<spring:escapeBody javaScriptEscape="true">${ANNOTATION_REGION_PLACE_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.annotation.label.place.prompt" var="ANNOTATION_LABEL_PLACE_PROMPT_VAR"/>
-				ANNOTATION_LABEL_PLACE_PROMPT : decoderDiv.html('<c:out value="${ANNOTATION_LABEL_PLACE_PROMPT_VAR}" />').text(),
+				ANNOTATION_LABEL_PLACE_PROMPT : '<spring:escapeBody javaScriptEscape="true">${ANNOTATION_LABEL_PLACE_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.transition.place.prompt" var="TRANSITION_PLACE_PROMPT_VAR"/>
-				TRANSITION_PLACE_PROMPT : decoderDiv.html('<c:out value="${TRANSITION_PLACE_PROMPT_VAR}" />').text(),
+				TRANSITION_PLACE_PROMPT : '<spring:escapeBody javaScriptEscape="true">${TRANSITION_PLACE_PROMPT_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.paste.error" var="PASTE_ERROR_VAR"/>
-				PASTE_ERROR : decoderDiv.html('<c:out value="${PASTE_ERROR_VAR}" />').text(),
+				PASTE_ERROR : '<spring:escapeBody javaScriptEscape="true">${PASTE_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.preview.error" var="PREVIEW_ERROR_VAR"/>
-				PREVIEW_ERROR : decoderDiv.html('<c:out value="${PREVIEW_ERROR_VAR}" />').text(),
+				PREVIEW_ERROR : '<spring:escapeBody javaScriptEscape="true">${PREVIEW_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.cross.branching.error" var="CROSS_BRANCHING_ERROR_VAR"/>
-				CROSS_BRANCHING_ERROR : decoderDiv.html('<c:out value="${CROSS_BRANCHING_ERROR_VAR}" />').text(),
+				CROSS_BRANCHING_ERROR : '<spring:escapeBody javaScriptEscape="true">${CROSS_BRANCHING_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.support.transition.error" var="SUPPORT_TRANSITION_ERROR_VAR"/>
-				SUPPORT_TRANSITION_ERROR : decoderDiv.html('<c:out value="${SUPPORT_TRANSITION_ERROR_VAR}" />').text(),
+				SUPPORT_TRANSITION_ERROR : '<spring:escapeBody javaScriptEscape="true">${SUPPORT_TRANSITION_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.end.match.error" var="END_MATCH_ERROR_VAR"/>
-				END_MATCH_ERROR : decoderDiv.html('<c:out value="${END_MATCH_ERROR_VAR}" />').text(),
-				
-				
+				END_MATCH_ERROR : '<spring:escapeBody javaScriptEscape="true">${END_MATCH_ERROR_VAR}</spring:escapeBody>',
+
 				// PropertyLib
 				<fmt:message key="authoring.fla.properties.dialog.title" var="PROPERTIES_DIALOG_TITLE_VAR"/>
-				PROPERTIES_DIALOG_TITLE : '<c:out value="${PROPERTIES_DIALOG_TITLE_VAR}" />',
+				PROPERTIES_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${PROPERTIES_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.group.naming.dialog.title" var="GROUP_NAMING_DIALOG_TITLE_VAR"/>
-				GROUP_NAMING_DIALOG_TITLE : '<c:out value="${GROUP_NAMING_DIALOG_TITLE_VAR}" />',
+				GROUP_NAMING_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${GROUP_NAMING_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.groups.to.branches.match.dialog_title" var="GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR"/>
-				GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE : '<c:out value="${GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR}" />',
+				GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.groups.header" var="BRANCH_MAPPING_GROUPS_HEADER_VAR"/>
-				BRANCH_MAPPING_GROUPS_HEADER : '<c:out value="${BRANCH_MAPPING_GROUPS_HEADER_VAR}" />',
+				BRANCH_MAPPING_GROUPS_HEADER : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_GROUPS_HEADER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.group.header" var="BRANCH_MAPPING_GROUP_HEADER_VAR"/>
-				BRANCH_MAPPING_GROUP_HEADER : '<c:out value="${BRANCH_MAPPING_GROUP_HEADER_VAR}" />',
+				BRANCH_MAPPING_GROUP_HEADER : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_GROUP_HEADER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.conditions.dialog.title" var="CONDITIONS_DIALOG_TITLE_VAR"/>
-				CONDITIONS_DIALOG_TITLE : '<c:out value="${CONDITIONS_DIALOG_TITLE_VAR}" />',
+				CONDITIONS_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${CONDITIONS_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.conditions.header" var="BRANCH_MAPPING_CONDITIONS_HEADER_VAR"/>
-				BRANCH_MAPPING_CONDITIONS_HEADER : '<c:out value="${BRANCH_MAPPING_CONDITIONS_HEADER_VAR}" />',
+				BRANCH_MAPPING_CONDITIONS_HEADER : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_CONDITIONS_HEADER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.condition.header" var="BRANCH_MAPPING_CONDITION_HEADER_VAR"/>
-				BRANCH_MAPPING_CONDITION_HEADER : '<c:out value="${BRANCH_MAPPING_CONDITION_HEADER_VAR}" />',
+				BRANCH_MAPPING_CONDITION_HEADER : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_CONDITION_HEADER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.gate.header" var="BRANCH_MAPPING_GATE_HEADER_VAR"/>
-				BRANCH_MAPPING_GATE_HEADER : '<c:out value="${BRANCH_MAPPING_GATE_HEADER_VAR}" />',
+				BRANCH_MAPPING_GATE_HEADER : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_GATE_HEADER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.branches.header" var="BRANCH_MAPPING_BRANCHES_HEADER_VAR"/>
-				BRANCH_MAPPING_BRANCHES_HEADER : '<c:out value="${BRANCH_MAPPING_BRANCHES_HEADER_VAR}" />',
+				BRANCH_MAPPING_BRANCHES_HEADER : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_BRANCHES_HEADER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.branch.header" var="BRANCH_MAPPING_BRANCH_HEADER_VAR"/>
-				BRANCH_MAPPING_BRANCH_HEADER : '<c:out value="${BRANCH_MAPPING_BRANCH_HEADER_VAR}" />',
+				BRANCH_MAPPING_BRANCH_HEADER : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_BRANCH_HEADER_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.gate.state.mapping.dialog.title" var="GATE_STATE_MAPPING_DIALOG_TITLE_VAR"/>
-				GATE_STATE_MAPPING_DIALOG_TITLE : '<c:out value="${GATE_STATE_MAPPING_DIALOG_TITLE_VAR}" />',
+				GATE_STATE_MAPPING_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${GATE_STATE_MAPPING_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.dialog.title" var="BRANCH_MAPPING_DIALOG_TITLE_VAR"/>
-				BRANCH_MAPPING_DIALOG_TITLE : '<c:out value="${BRANCH_MAPPING_DIALOG_TITLE_VAR}" />',
+				BRANCH_MAPPING_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.gate.state.open" var="GATE_STATE_OPEN_VAR"/>
-				GATE_STATE_OPEN : '<c:out value="${GATE_STATE_OPEN_VAR}" />',
+				GATE_STATE_OPEN : '<spring:escapeBody javaScriptEscape="true">${GATE_STATE_OPEN_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.gate.state.closed" var="GATE_STATE_CLOSED_VAR"/>
-				GATE_STATE_CLOSED : '<c:out value="${GATE_STATE_CLOSED_VAR}" />',
+				GATE_STATE_CLOSED : '<spring:escapeBody javaScriptEscape="true">${GATE_STATE_CLOSED_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branch.mapping.default.branch.suffix" var="BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX_VAR"/>
-				BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX : '<c:out value="${BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX_VAR}" />',
+				BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.complex.output.suffix" var="COMPLEX_OUTPUT_SUFFIX_VAR"/>
-				COMPLEX_OUTPUT_SUFFIX : '<c:out value="${COMPLEX_OUTPUT_SUFFIX_VAR}" />',
+				COMPLEX_OUTPUT_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${COMPLEX_OUTPUT_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.range.output.suffix" var="RANGE_OUTPUT_SUFFIX_VAR"/>
-				RANGE_OUTPUT_SUFFIX : '<c:out value="${RANGE_OUTPUT_SUFFIX_VAR}" />',
+				RANGE_OUTPUT_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${RANGE_OUTPUT_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.boolean.output.suffix" var="BOOLEAN_OUTPUT_SUFFIX_VAR"/>
-				BOOLEAN_OUTPUT_SUFFIX : '<c:out value="${BOOLEAN_OUTPUT_SUFFIX_VAR}" />',
+				BOOLEAN_OUTPUT_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BOOLEAN_OUTPUT_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.range.condition.description" var="RANGE_CONDITION_DESCRIPTION_VAR"/>
-				RANGE_CONDITION_DESCRIPTION : '<c:out value="${RANGE_CONDITION_DESCRIPTION_VAR}" />',
+				RANGE_CONDITION_DESCRIPTION : '<spring:escapeBody javaScriptEscape="true">${RANGE_CONDITION_DESCRIPTION_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.exact.condition.description" var="EXACT_CONDITION_DESCRIPTION_VAR"/>
-				EXACT_CONDITION_DESCRIPTION : '<c:out value="${EXACT_CONDITION_DESCRIPTION_VAR}" />',
-				<fmt:message key="authoring.fla.less.condition.description" var="LESS_CONDITION_DESCRIPTION_VAR"/>
-				LESS_CONDITION_DESCRIPTION : '<c:out value="${LESS_CONDITION_DESCRIPTION_VAR}" />',
+				EXACT_CONDITION_DESCRIPTION : '<spring:escapeBody javaScriptEscape="true">${EXACT_CONDITION_DESCRIPTION_VAR}</spring:escapeBody>',
+				<fmt:message key="authoring.fla.less.conditiondescription" var="LESS_CONDITION_DESCRIPTION_VAR"/>
+				LESS_CONDITION_DESCRIPTION : '<spring:escapeBody javaScriptEscape="true">${LESS_CONDITION_DESCRIPTION_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.greater.condition.description" var="GREATER_CONDITION_DESCRIPTION_VAR"/>
-				GREATER_CONDITION_DESCRIPTION : '<c:out value="${GREATER_CONDITION_DESCRIPTION_VAR}" />',
+				GREATER_CONDITION_DESCRIPTION : '<spring:escapeBody javaScriptEscape="true">${GREATER_CONDITION_DESCRIPTION_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.activity.unnamed.description" var="ACTIVITY_UNNAMED_DESCRIPTION_VAR"/>
-				ACTIVITY_UNNAMED_DESCRIPTION : decoderDiv.html('<c:out value="${ACTIVITY_UNNAMED_DESCRIPTION_VAR}" />').text(),
+				ACTIVITY_UNNAMED_DESCRIPTION : '<spring:escapeBody javaScriptEscape="true">${ACTIVITY_UNNAMED_DESCRIPTION_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.activity.gate.description" var="ACTIVITY_GATE_DESCRIPTION_VAR"/>
-				ACTIVITY_GATE_DESCRIPTION : decoderDiv.html('<c:out value="${ACTIVITY_GATE_DESCRIPTION_VAR}" />').text(),
+				ACTIVITY_GATE_DESCRIPTION : '<spring:escapeBody javaScriptEscape="true">${ACTIVITY_GATE_DESCRIPTION_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.activity.branching.description" var="ACTIVITY_BRANCHING_DESCRIPTION_VAR"/>
-				ACTIVITY_BRANCHING_DESCRIPTION : decoderDiv.html('<c:out value="${ACTIVITY_BRANCHING_DESCRIPTION_VAR}" />').text(),
+				ACTIVITY_BRANCHING_DESCRIPTION : '<spring:escapeBody javaScriptEscape="true">${ACTIVITY_BRANCHING_DESCRIPTION_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.range.condition.title.prefix" var="DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR"/>
-				DEFAULT_RANGE_CONDITION_TITLE_PREFIX : '<c:out value="${DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR}" />',
+				DEFAULT_RANGE_CONDITION_TITLE_PREFIX : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.page.prop.gradebook.none" var="GRADEBOOK_OUTPUT_NONE_VAR"/>
-				GRADEBOOK_OUTPUT_NONE : '<c:out value="${GRADEBOOK_OUTPUT_NONE_VAR}" />',
+				GRADEBOOK_OUTPUT_NONE : '<spring:escapeBody javaScriptEscape="true">${GRADEBOOK_OUTPUT_NONE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.clear.all.confirm" var="CLEAR_ALL_CONFIRM_VAR"/>
-				CLEAR_ALL_CONFIRM : decoderDiv.html('<c:out value="${CLEAR_ALL_CONFIRM_VAR}" />').text(),
+				CLEAR_ALL_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${CLEAR_ALL_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.remove.condition.confirm" var="REMOVE_CONDITION_CONFIRM_VAR"/>
-				REMOVE_CONDITION_CONFIRM : decoderDiv.html('<c:out value="${REMOVE_CONDITION_CONFIRM_VAR}" />').text(),
+				REMOVE_CONDITION_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${REMOVE_CONDITION_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.conditions.to.default.gate.state.confirm" var="CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR"/>
-				CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM : decoderDiv.html('<c:out value="${CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR}" />').text(),
+				CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.conditions.to.default.branch.confirm" var="CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
-				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : decoderDiv.html('<c:out value="${CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />').text(),
+				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.groups.to.default.branch.confirm" var="GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
-				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : decoderDiv.html('<c:out value="${GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />').text(),
+				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.range.condition.add.start.greater.than.end.error" var="RANGE_CONDITION_ADD_START_GREATER_THAN_END_ERROR_VAR"/>
-				RANGE_CONDITION_ADD_START_GREATER_THAN_END_ERROR: decoderDiv.html('<c:out value="${RANGE_CONDITION_ADD_START_GREATER_THAN_END_ERROR_VAR}" />').text(),
+				RANGE_CONDITION_ADD_START_GREATER_THAN_END_ERROR : '<spring:escapeBody javaScriptEscape="true">${RANGE_CONDITION_ADD_START_GREATER_THAN_END_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.range.condition.add.start.error" var="RANGE_CONDITION_ADD_START_ERROR_VAR"/>
-				RANGE_CONDITION_ADD_START_ERROR : decoderDiv.html('<c:out value="${RANGE_CONDITION_ADD_START_ERROR_VAR}" />').text(),
+				RANGE_CONDITION_ADD_START_ERROR : '<spring:escapeBody javaScriptEscape="true">${RANGE_CONDITION_ADD_START_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.range.condition.add.end.error" var="RANGE_CONDITION_ADD_END_ERROR_VAR"/>
-				RANGE_CONDITION_ADD_END_ERROR : decoderDiv.html('<c:out value="${RANGE_CONDITION_ADD_END_ERROR_VAR}" />').text(),
+				RANGE_CONDITION_ADD_END_ERROR : '<spring:escapeBody javaScriptEscape="true">${RANGE_CONDITION_ADD_END_ERROR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.group.title.validation.erorr" var="GROUP_TITLE_VALIDATION_ERORR_VAR"/>
-				GROUP_TITLE_VALIDATION_ERORR : decoderDiv.html('<c:out value="${GROUP_TITLE_VALIDATION_ERORR_VAR}" />').text(),
+				GROUP_TITLE_VALIDATION_ERORR : '<spring:escapeBody javaScriptEscape="true">${GROUP_TITLE_VALIDATION_ERORR_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.conditions.mapping.broken" var="CONDITIONS_MAPPING_BROKEN_ERROR_VAR"/>
-				CONDITIONS_MAPPING_BROKEN_ERROR : decoderDiv.html('<c:out value="${CONDITIONS_MAPPING_BROKEN_ERROR_VAR}" />').text()
+				CONDITIONS_MAPPING_BROKEN_ERROR : '<spring:escapeBody javaScriptEscape="true">${CONDITIONS_MAPPING_BROKEN_ERROR_VAR}</spring:escapeBody>'
 			},
 
 			canSetReadOnly = ${canSetReadOnly},
Index: lams_central/web/authoring/svgGenerator.jsp
===================================================================
diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
+++ lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -22,27 +22,28 @@
 			LABELS = {
 				// ActivityLib
 				<fmt:message key="authoring.fla.default.group.title" var="DEFAULT_GROUPING_TITLE_VAR"/>
-				DEFAULT_GROUPING_TITLE : '<c:out value="${DEFAULT_GROUPING_TITLE_VAR}" />',
+				DEFAULT_GROUPING_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_GROUPING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.group.prefix" var="DEFAULT_GROUP_PREFIX_VAR"/>
-				DEFAULT_GROUP_PREFIX : '<c:out value="${DEFAULT_GROUP_PREFIX_VAR}" />',
+				DEFAULT_GROUP_PREFIX : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_GROUP_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.branching.title" var="DEFAULT_BRANCHING_TITLE_VAR"/>
-				DEFAULT_BRANCHING_TITLE : '<c:out value="${DEFAULT_BRANCHING_TITLE_VAR}" />',
+				DEFAULT_BRANCHING_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_BRANCHING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.branch.prefix" var="DEFAULT_BRANCH_PREFIX_VAR"/>
-				DEFAULT_BRANCH_PREFIX : '<c:out value="${DEFAULT_BRANCH_PREFIX_VAR}" />',
+				DEFAULT_BRANCH_PREFIX : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_BRANCH_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.optional.activity.title" var="DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR"/>
-				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<c:out value="${DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR}" />',
+				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.support.activity.title" var="SUPPORT_ACTIVITY_TITLE_VAR"/>
-				SUPPORT_ACTIVITY_TITLE : '<c:out value="${SUPPORT_ACTIVITY_TITLE_VAR}" />',
+				SUPPORT_ACTIVITY_TITLE : '<spring:escapeBody javaScriptEscape="true">${SUPPORT_ACTIVITY_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.gate.activity.label" var="GATE_ACTIVITY_LABEL_VAR"/>
-				GATE_ACTIVITY_LABEL : '<c:out value="${GATE_ACTIVITY_LABEL_VAR}" />',
+				GATE_ACTIVITY_LABEL : '<spring:escapeBody javaScriptEscape="true">${GATE_ACTIVITY_LABEL_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branching.start.suffix" var="BRANCHING_START_SUFFIX_VAR"/>
-				BRANCHING_START_SUFFIX : '<c:out value="${BRANCHING_START_SUFFIX_VAR}" />',
+				BRANCHING_START_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BRANCHING_START_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branching.end.suffix" var="BRANCHING_END_SUFFIX_VAR"/>
-				BRANCHING_END_SUFFIX : '<c:out value="${BRANCHING_END_SUFFIX_VAR}" />',
-				
+				BRANCHING_END_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BRANCHING_END_SUFFIX_VAR}</spring:escapeBody>',
+
 				// DecorationLib
 				<fmt:message key="authoring.fla.default.annotation.label.title" var="DEFAULT_ANNOTATION_LABEL_TITLE_VAR"/>
-				DEFAULT_ANNOTATION_LABEL_TITLE : '<c:out value="${DEFAULT_ANNOTATION_LABEL_TITLE_VAR}" />'
+				DEFAULT_ANNOTATION_LABEL_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_ANNOTATION_LABEL_TITLE_VAR}</spring:escapeBody>'
+
 			},
 			
 			paperMinWidth = 1000,
Index: lams_central/web/comments/edit.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/comments/edit.jsp	(.../edit.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/comments/edit.jsp	(.../edit.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -34,7 +34,7 @@
 		
 		var theForm = $(editForm);			
 
-		if ( validateBodyText($('#editFormBody').val(), <%=CommentConstants.MAX_BODY_LENGTH%>, "<fmt:message key="label.comment.body.validation" />") ) {
+		if ( validateBodyText($('#editFormBody').val(), <%=CommentConstants.MAX_BODY_LENGTH%>, "<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.comment.body.validation" /></spring:escapeBody>") ) {
 	    	$.ajax({ // create an AJAX call...
 		        data: theForm.serialize(), 
 	    	    processData: false, // tell jQuery not to process the data
@@ -48,7 +48,7 @@
 					// make sure the old edit form is gone, so the user won't try to submit it again
 					$('#edit').remove();
 				}
-				reloadThread(response,'<lams:LAMSURL />','<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
+				reloadThread(response,'<lams:LAMSURL />','<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>','<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.please.refresh"/></spring:escapeBody>');
     		});
 		} // end validateBodyText
 		else {
Index: lams_central/web/comments/new.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/comments/new.jsp	(.../new.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/comments/new.jsp	(.../new.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -19,7 +19,7 @@
 		disableButton(btnName);
 
 		if (validateBodyText($('#newFormBody').val(),
-<%=CommentConstants.MAX_BODY_LENGTH%>,"<fmt:message key="label.comment.body.validation" />")) {
+<%=CommentConstants.MAX_BODY_LENGTH%>,"<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.comment.body.validation" /></spring:escapeBody>")) {
 
 			$.ajax({ // create an AJAX call...
 						data : theForm.serialize(),
@@ -45,7 +45,7 @@
 										newCommentDiv.firstChild);
 
 								if (!newCommentDiv || !newThreadDiv) {
-									alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+									alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>');
 								} else if (commentUid) {
 									var loadString = '<lams:LAMSURL />comments/viewTopicThread.do?sessionMapID='
 											+ response.sessionMapID
@@ -62,7 +62,7 @@
 									alert(response.errMessage);
 									enableButton(btnName);
 								} else {
-									alert('<fmt:message key="error.please.refresh"/>');
+									alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.please.refresh"/></spring:escapeBody>');
 								}
 
 							});
Index: lams_central/web/comments/reply.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/comments/reply.jsp	(.../reply.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/comments/reply.jsp	(.../reply.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -31,7 +31,7 @@
 		
 		var theForm = $(replyForm);
 		if (validateBodyText($('#replyFormBody').val(), <%=CommentConstants.MAX_BODY_LENGTH%>,
-				"<fmt:message key="label.comment.body.validation" />")) {
+				"<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.comment.body.validation" /></spring:escapeBody>")) {
 
 			$.ajax({ // create an AJAX call...
 				data : theForm.serialize(),
@@ -51,8 +51,8 @@
 				reloadThread(
 					response,
 					'<lams:LAMSURL />',
-					'<fmt:message key="error.cannot.redisplay.please.refresh"/>',
-					'<fmt:message key="error.please.refresh"/>'
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>',
+					'<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.please.refresh"/></spring:escapeBody>'
 				);
 			});
 		} // end validateBodyText
Index: lams_central/web/comments/topicview.jsp
===================================================================
diff -u -r70a58e52215be36bba02d60d98eee77b372accf1 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision 70a58e52215be36bba02d60d98eee77b372accf1)
+++ lams_central/web/comments/topicview.jsp	(.../topicview.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -5,9 +5,9 @@
 <c:set var="messageTablename" value=""/>
 <c:set var="indent" value="10"/>
 
-<c:set var="show"><fmt:message key="label.show" /></c:set>
-<c:set var="hide"><fmt:message key="label.hide" /></c:set>
-<c:set var="prompt"><fmt:message key="label.showhide.prompt" /></c:set>
+<c:set var="show"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.show" /></spring:escapeBody></c:set>
+<c:set var="hide"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.hide" /></spring:escapeBody></c:set>
+<c:set var="prompt"><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.showhide.prompt" /></spring:escapeBody></c:set>
 <c:set var="tableCommand">expandable:true,initialState:'expanded',
 	expanderTemplate:'<a href=\"#\"><span style="margin-left:20px">${prompt}</span></a>',
 	stringCollapse:'${hide}',stringExpand:'${show}',
@@ -43,7 +43,7 @@
 	
 	function createReply(commentUid, url) {
 		if ( document.getElementById('reply') ) {
-			alert('<fmt:message key="message.complete.or.cancel.reply"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.complete.or.cancel.reply"/></spring:escapeBody>');
 		} else {
 			// set up the new reply area
 			var replyDiv = document.createElement("div");
@@ -60,7 +60,7 @@
 	
 	function createEdit(commentUid, url) {
 		if ( document.getElementById('edit') ) {
-			alert('<fmt:message key="message.complete.or.cancel.edit"/>');
+			alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="message.complete.or.cancel.edit"/></spring:escapeBody>');
 		} else {
 			// set up the new edit area
 			// set up the new reply area
@@ -107,7 +107,7 @@
     		var serverCommentUid = response.commentUid;
        		
     		if ( ! commentUid || serverCommentUid != commentUid ) {
-				alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+				alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.cannot.redisplay.please.refresh"/></spring:escapeBody>');
   			} else if ( response.status ) {
   				var currentCount = $('#msglikeCount'+commentUid).html();
   				currentCount = +currentCount + incValue;
Index: lams_central/web/editLessonIntro.jsp
===================================================================
diff -u -rae4e7fd3d6b21cb7f41a733565442950cdd9d232 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision ae4e7fd3d6b21cb7f41a733565442950cdd9d232)
+++ lams_central/web/editLessonIntro.jsp	(.../editLessonIntro.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -17,7 +17,7 @@
 					$("#lessonDescription").val(CKEDITOR.instances.lessonDescription.getData());                 
 				},
 			    success:    function() {
-			    	alert('<fmt:message key="label.lesson.introduction.updated"/>');
+			    	alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.lesson.introduction.updated" /></spring:escapeBody>');
 			    	if ( typeof parent.window.refreshMonitor !== "undefined") {
 						parent.window.refreshMonitor('lesson', false);
 						parent.window.closeIntroductionDialog();
Index: lams_central/web/errorpages/error.jsp
===================================================================
diff -u -r245131a647fbf7add783dd2fc9c9bf82322530a9 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/errorpages/error.jsp	(.../error.jsp)	(revision 245131a647fbf7add783dd2fc9c9bf82322530a9)
+++ lams_central/web/errorpages/error.jsp	(.../error.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -19,11 +19,11 @@
 				var messageDetail = document.getElementById('messageDetail'),
 					showButt = document.getElementById('showButt');
 				if (messageDetail.style.display == 'none') {
-					showButt.innerHTML = "<fmt:message key='msg.hide.detail'/>";
+					showButt.innerHTML = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='msg.hide.detail'/></spring:escapeBody>";
 					messageDetail.style.display = 'inline';
 
 				} else {
-					showButt.innerHTML = "<fmt:message key='msg.show.detail'/>";
+					showButt.innerHTML = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='msg.show.detail'/></spring:escapeBody>";
 					messageDetail.style.display = 'none';
 				}
 			}
Index: lams_central/web/forgotPassword.jsp
===================================================================
diff -u -r4168ef9b07ea319bdd66dd09779ed7e9b6e1e156 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 4168ef9b07ea319bdd66dd09779ed7e9b6e1e156)
+++ lams_central/web/forgotPassword.jsp	(.../forgotPassword.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -30,10 +30,10 @@
 				var filter = /^(.)+\@(.)+\.(.)+/;
 
 				if (email == null || email == "") {
-					alert("<fmt:message key="error.forgot.password.email" />");
+					alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.forgot.password.email' /></spring:escapeBody>");
 					return false;
 				} else if (!filter.test(email)) {
-					alert("<fmt:message key="error.valid.email.required" />");
+					alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.valid.email.required' /></spring:escapeBody>");
 					return false;
 				} else {
 					document.forms.forgotForm.submit();
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
diff -u -rf8666ee5b70096c5e0e70e09f43a69a290932ff1 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision f8666ee5b70096c5e0e70e09f43a69a290932ff1)
+++ lams_central/web/forgotPasswordChange.jsp	(.../forgotPasswordChange.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -63,18 +63,18 @@
 				},
 
 				// Specify the validation error messages
-				messages : {
-					newPassword : {
-						required : "<fmt:message key='error.password.empty'/>",
-						minlength : "<fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
-						maxlength : "<fmt:message key='label.password.max.length'/>",
-						charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
-						pwcheck : "<fmt:message key='label.password.restrictions'/>"
+				messages: {
+					newPassword: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.password.empty'/></spring:escapeBody>",
+						minlength: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message></spring:escapeBody>",
+						maxlength: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.max.length'/></spring:escapeBody>",
+						charactersAllowed: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.symbols.allowed'/></spring:escapeBody> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \\ | : ; \" ' < > , . ? /",
+						pwcheck: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.restrictions'/></spring:escapeBody>"
 					},
-					confirmNewPassword : {
-						required : "<fmt:message key='error.password.empty'/>",
-						equalTo : "<fmt:message key='error.newpassword.mismatch'/>"
-					},
+					confirmNewPassword: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.password.empty'/></spring:escapeBody>",
+						equalTo: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.newpassword.mismatch'/></spring:escapeBody>"
+					}
 				},
 
 				submitHandler : function(form) {
Index: lams_central/web/groups.jsp
===================================================================
diff -u -ra37796f7a223319171f7ec60074998240aa0c95d -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/groups.jsp	(.../groups.jsp)	(revision a37796f7a223319171f7ec60074998240aa0c95d)
+++ lams_central/web/groups.jsp	(.../groups.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -47,40 +47,57 @@
 				csrfTokenValue = '<csrf:tokenvalue/>',
 
 				LAMS_URL = '<lams:LAMSURL/>',
-				decoderDiv = $('<div />'),
 				LABELS = {
 					<fmt:message key="label.course.groups.prefix" var="GROUP_PREFIX_LABEL_VAR"/>
-					GROUP_PREFIX_LABEL : '<c:out value="${GROUP_PREFIX_LABEL_VAR}" />',
+					GROUP_PREFIX_LABEL : "<spring:escapeBody javaScriptEscape='true'>${GROUP_PREFIX_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.course.groups.remove.confirm" var="GROUP_REMOVE_LABEL_VAR"/>
-					GROUP_REMOVE_LABEL : decoderDiv.html('<c:out value="${GROUP_REMOVE_LABEL_VAR}" />').text(),
+					GROUP_REMOVE_LABEL : "<spring:escapeBody javaScriptEscape='true'>${GROUP_REMOVE_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.course.groups.remove.empty.confirm" var="EMPTY_GROUP_SAVE_LABEL_VAR"/>
-					EMPTY_GROUP_SAVE_LABEL : decoderDiv.html('<c:out value="${EMPTY_GROUP_SAVE_LABEL_VAR}" />').text(),
+					EMPTY_GROUP_SAVE_LABEL : "<spring:escapeBody javaScriptEscape='true'>${EMPTY_GROUP_SAVE_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.course.groups.locked" var="GROUP_LOCK_LABEL_VAR"/>
-					GROUP_LOCK_LABEL : decoderDiv.html('<c:out value="${GROUP_LOCK_LABEL_VAR}" />').text(),
+					GROUP_LOCK_LABEL : "<spring:escapeBody javaScriptEscape='true'>${GROUP_LOCK_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.course.groups.locked.transfer" var="TRANSFER_LOCKED_LABEL_VAR"/>
-					TRANSFER_LOCKED_LABEL : decoderDiv.html('<c:out value="${TRANSFER_LOCKED_LABEL_VAR}" />').text(),
+					TRANSFER_LOCKED_LABEL : "<spring:escapeBody javaScriptEscape='true'>${TRANSFER_LOCKED_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.save.as.course.grouping" var="SAVE_AS_COURSE_GROUPING_LABEL_VAR"/>
-					SAVE_AS_COURSE_GROUPING_LABEL : decoderDiv.html('<c:out value="${SAVE_AS_COURSE_GROUPING_LABEL_VAR}" />').text(),
+					SAVE_AS_COURSE_GROUPING_LABEL : "<spring:escapeBody javaScriptEscape='true'>${SAVE_AS_COURSE_GROUPING_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.course.groups.name.blank" var="NAME_BLANK_LABEL_VAR"/>
-					NAME_BLANK_LABEL : decoderDiv.html('<c:out value="${NAME_BLANK_LABEL_VAR}" />').text(),
+					NAME_BLANK_LABEL : "<spring:escapeBody javaScriptEscape='true'>${NAME_BLANK_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.course.groups.name.not.unique" var="NAME_NOT_UNIQUE_LABEL_VAR"/>
-					NAME_NOT_UNIQUE_LABEL : decoderDiv.html('<c:out value="${NAME_NOT_UNIQUE_LABEL_VAR}" />').text(),
+					NAME_NOT_UNIQUE_LABEL : "<spring:escapeBody javaScriptEscape='true'>${NAME_NOT_UNIQUE_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.enter.course.grouping.name" var="ENTER_COURSE_GROUPING_NAME_LABEL_VAR"/>
-					ENTER_COURSE_GROUPING_NAME_LABEL : decoderDiv.html('<c:out value="${ENTER_COURSE_GROUPING_NAME_LABEL_VAR}" />').text(),
+					ENTER_COURSE_GROUPING_NAME_LABEL : "<spring:escapeBody javaScriptEscape='true'>${ENTER_COURSE_GROUPING_NAME_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="authoring.msg.save.success" var="SAVED_SUCCESSFULLY_LABEL_VAR"/>
-					SAVED_SUCCESSFULLY_LABEL : decoderDiv.html('<c:out value="${SAVED_SUCCESSFULLY_LABEL_VAR}" />').text(),
+					SAVED_SUCCESSFULLY_LABEL : "<spring:escapeBody javaScriptEscape='true'>${SAVED_SUCCESSFULLY_LABEL_VAR}</spring:escapeBody>",
+
 					<fmt:message key="label.import.warning.replace.groups" var="WARNING_REPLACE_GROUPS_VAR"/>
-					WARNING_REPLACE_GROUPS_LABEL : decoderDiv.html('<c:out value="${WARNING_REPLACE_GROUPS_VAR}" />').text(),
+					WARNING_REPLACE_GROUPS_LABEL : "<spring:escapeBody javaScriptEscape='true'>${WARNING_REPLACE_GROUPS_VAR}</spring:escapeBody>",
+
 					<fmt:message key="error.general.1" var="ERROR1_VAR"/>
 					<fmt:message key="error.general.2" var="ERROR2_VAR"/>
 					<fmt:message key="error.general.3" var="ERROR3_VAR"/>
-					GENERAL_ERROR_LABEL : decoderDiv.html('<c:out value="${ERROR1_VAR}" />\n<c:out value="${ERROR2_VAR}" />\n<c:out value="${ERROR3_VAR}" />').text(),
+					GENERAL_ERROR_LABEL : "<spring:escapeBody javaScriptEscape='true'>${ERROR1_VAR}</spring:escapeBody>\n<spring:escapeBody javaScriptEscape='true'>${ERROR2_VAR}</spring:escapeBody>\n<spring:escapeBody javaScriptEscape='true'>${ERROR3_VAR}</spring:escapeBody>",
+
 					<fmt:message key="error.file.required" var="ERROR_FILE_REQUIRED_VAR"/>
-					ERROR_FILE_REQUIRED_LABEL : decoderDiv.html('<c:out value="${ERROR_FILE_REQUIRED_VAR}" />').text(),
+					ERROR_FILE_REQUIRED_LABEL : "<spring:escapeBody javaScriptEscape='true'>${ERROR_FILE_REQUIRED_VAR}</spring:escapeBody>",
+
 					<fmt:message key="error.file.wrong.format" var="ERROR_FILE_WRONG_FORMAT_VAR"/>
-					ERROR_FILE_WRONG_FORMAT_LABEL : decoderDiv.html('<c:out value="${ERROR_FILE_WRONG_FORMAT_VAR}" />').text(),
-					<fmt:message key="label.import.successful" var="LABEL_IMPORT_SUCCESSFUL_VAR"><fmt:param value="%1"/><fmt:param value="%2"/></fmt:message>
-					LABEL_IMPORT_SUCCESSFUL_LABEL : decoderDiv.html('<c:out value="${LABEL_IMPORT_SUCCESSFUL_VAR}" />').text(),
+					ERROR_FILE_WRONG_FORMAT_LABEL : "<spring:escapeBody javaScriptEscape='true'>${ERROR_FILE_WRONG_FORMAT_VAR}</spring:escapeBody>",
+
+					<fmt:message key="label.import.successful" var="LABEL_IMPORT_SUCCESSFUL_VAR">
+					<fmt:param value="%1"/>
+					<fmt:param value="%2"/>
+					</fmt:message>
+					LABEL_IMPORT_SUCCESSFUL_LABEL : "<spring:escapeBody javaScriptEscape='true'>${LABEL_IMPORT_SUCCESSFUL_VAR}</spring:escapeBody>",
+
 				};
 
 		<!-- LDEV_NTU-7 Page jumps to the top when clicking the link in Grouping -->
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -43,15 +43,14 @@
 		var tree;
 		var userId = '<lams:user property="userID"/>',
 			LAMS_URL = '<lams:LAMSURL/>',
-			decoderDiv = $('<div />'),
+
 			LABEL_RUN_SEQUENCES_FOLDER = '<fmt:message key="label.tab.lesson.sequence.folder" />',
 			LABEL_NAME_INVALID_CHARACTERS = '<fmt:message key="error.lessonname.invalid.characters" />',
 			LABELS = {
-				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
-				NAVIGATE_AWAY_CONFIRM : decoderDiv.html('<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />').text(),
-				<fmt:message key="authoring.fla.page.title" var="AUTHORING_TITLE_VAR"/>
-				AUTHORING_TITLE : '<c:out value="${AUTHORING_TITLE_VAR}" />'
+				NAVIGATE_AWAY_CONFIRM : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='authoring.fla.navigate.away.confirm' /></spring:escapeBody>",
+				AUTHORING_TITLE : "<spring:escapeBody javaScriptEscape='true'><fmt:message key='authoring.fla.page.title' /></spring:escapeBody>"
 			};
+;
 	
 	$(document).ready(function (){
 		tree = $('#learningDesignTree');
Index: lams_central/web/main.jsp
===================================================================
diff -u -rb6d55d571ea99a87a367fec36df40ec45627b0ea -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/main.jsp	(.../main.jsp)	(revision b6d55d571ea99a87a367fec36df40ec45627b0ea)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -31,68 +31,67 @@
 	<lams:JSImport src="includes/javascript/main.js" />
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',	
-			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
-				EMAIL_NOTIFICATIONS_TITLE : '<c:out value="${EMAIL_NOTIFICATIONS_TITLE_VAR}" />',
+				EMAIL_NOTIFICATIONS_TITLE : '<spring:escapeBody javaScriptEscape="true">${EMAIL_NOTIFICATIONS_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.remove.lesson.confirm1" var="REMOVE_LESSON_CONFIRM1_VAR"/>
-				REMOVE_LESSON_CONFIRM1 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM1_VAR}" />').text(),
+				REMOVE_LESSON_CONFIRM1 : '<spring:escapeBody javaScriptEscape="true">${REMOVE_LESSON_CONFIRM1_VAR}</spring:escapeBody>',
 				<fmt:message key="index.remove.lesson.confirm2" var="REMOVE_LESSON_CONFIRM2_VAR"/>
-				REMOVE_LESSON_CONFIRM2 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM2_VAR}" />').text(),
+				REMOVE_LESSON_CONFIRM2 : '<spring:escapeBody javaScriptEscape="true">${REMOVE_LESSON_CONFIRM2_VAR}</spring:escapeBody>',
 				<fmt:message key="label.enable.lesson.sorting" var="SORTING_ENABLE_VAR"/>
-				SORTING_ENABLE : '<c:out value="${SORTING_ENABLE_VAR}" />',
+				SORTING_ENABLE : '<spring:escapeBody javaScriptEscape="true">${SORTING_ENABLE_VAR}</spring:escapeBody>',
 				<fmt:message key="label.disable.lesson.sorting" var="SORTING_DISABLE_VAR"/>
-				SORTING_DISABLE : '<c:out value="${SORTING_DISABLE_VAR}" />',
+				SORTING_DISABLE : '<spring:escapeBody javaScriptEscape="true">${SORTING_DISABLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.addlesson" var="ADD_LESSON_TITLE_VAR"/>
-				ADD_LESSON_TITLE : '<c:out value="${ADD_LESSON_TITLE_VAR}" />',
+				ADD_LESSON_TITLE : '<spring:escapeBody javaScriptEscape="true">${ADD_LESSON_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.single.activity.lesson.title" var="SINGLE_ACTIVITY_LESSON_TITLE_VAR"/>
-				SINGLE_ACTIVITY_LESSON_TITLE : '<c:out value="${SINGLE_ACTIVITY_LESSON_TITLE_VAR}" />',
+				SINGLE_ACTIVITY_LESSON_TITLE : '<spring:escapeBody javaScriptEscape="true">${SINGLE_ACTIVITY_LESSON_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.gradebook.course.title" var="GRADEBOOK_COURSE_TITLE_VAR"/>
-				GRADEBOOK_COURSE_TITLE : '<c:out value="${GRADEBOOK_COURSE_TITLE_VAR}" />',
+				GRADEBOOK_COURSE_TITLE : '<spring:escapeBody javaScriptEscape="true">${GRADEBOOK_COURSE_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.gradebook.lesson.title" var="GRADEBOOK_LESSON_TITLE_VAR"/>
-				GRADEBOOK_LESSON_TITLE : '<c:out value="${GRADEBOOK_LESSON_TITLE_VAR}" />',
+				GRADEBOOK_LESSON_TITLE : '<spring:escapeBody javaScriptEscape="true">${GRADEBOOK_LESSON_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.gradebook.learner.title" var="GRADEBOOK_LEARNER_TITLE_VAR"/>
-				GRADEBOOK_LEARNER_TITLE : '<c:out value="${GRADEBOOK_LEARNER_TITLE_VAR}" />',
+				GRADEBOOK_LEARNER_TITLE : '<spring:escapeBody javaScriptEscape="true">${GRADEBOOK_LEARNER_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.conditions.title" var="CONDITIONS_TITLE_VAR"/>
-				CONDITIONS_TITLE : '<c:out value="${CONDITIONS_TITLE_VAR}" />',
+				CONDITIONS_TITLE : '<spring:escapeBody javaScriptEscape="true">${CONDITIONS_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.search.lesson.title" var="SEARCH_LESSON_TITLE_VAR"/>
-				SEARCH_LESSON_TITLE : '<c:out value="${SEARCH_LESSON_TITLE_VAR}" />',
+				SEARCH_LESSON_TITLE : '<spring:escapeBody javaScriptEscape="true">${SEARCH_LESSON_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.course.groups.title" var="COURSE_GROUPS_TITLE_VAR"/>
-				COURSE_GROUPS_TITLE : '<c:out value="${COURSE_GROUPS_TITLE_VAR}" />',
+				COURSE_GROUPS_TITLE : '<spring:escapeBody javaScriptEscape="true">${COURSE_GROUPS_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
-				NAVIGATE_AWAY_CONFIRM : decoderDiv.html('<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />').text(),
+				NAVIGATE_AWAY_CONFIRM : '<spring:escapeBody javaScriptEscape="true">${NAVIGATE_AWAY_CONFIRM_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.page.title" var="AUTHORING_TITLE_VAR"/>
-				AUTHORING_TITLE : '<c:out value="${AUTHORING_TITLE_VAR}" />',
+				AUTHORING_TITLE : '<spring:escapeBody javaScriptEscape="true">${AUTHORING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.monitoring.title" var="MONITORING_TITLE_VAR"/>
-				MONITORING_TITLE : '<c:out value="${MONITORING_TITLE_VAR}" />',
+				MONITORING_TITLE : '<spring:escapeBody javaScriptEscape="true">${MONITORING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.kumalive.rubric" var="KUMALIVE_RUBRICS_TITLE_VAR"/>
-				KUMALIVE_RUBRICS_TITLE : '<c:out value="${KUMALIVE_RUBRICS_TITLE_VAR}" />',
+				KUMALIVE_RUBRICS_TITLE : '<spring:escapeBody javaScriptEscape="true">${KUMALIVE_RUBRICS_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.kumalive.report" var="KUMALIVE_REPORT_TITLE_VAR"/>
-				KUMALIVE_REPORT_TITLE : '<c:out value="${KUMALIVE_REPORT_TITLE_VAR}" />',
+				KUMALIVE_REPORT_TITLE : '<spring:escapeBody javaScriptEscape="true">${KUMALIVE_REPORT_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="label.private.notifications.title" var="PRIVATE_NOTIFICATIONS_TITLE_VAR"/>
-				PRIVATE_NOTIFICATIONS_TITLE : '<c:out value="${PRIVATE_NOTIFICATIONS_TITLE_VAR}" />',
+				PRIVATE_NOTIFICATIONS_TITLE : '<spring:escapeBody javaScriptEscape="true">${PRIVATE_NOTIFICATIONS_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="label.private.notifications.messages" var="PRIVATE_NOTIFICATIONS_MESSAGES_VAR"/>
-				PRIVATE_NOTIFICATIONS_MESSAGES : '<c:out value="${PRIVATE_NOTIFICATIONS_MESSAGES_VAR}" />',
+				PRIVATE_NOTIFICATIONS_MESSAGES : '<spring:escapeBody javaScriptEscape="true">${PRIVATE_NOTIFICATIONS_MESSAGES_VAR}</spring:escapeBody>',
 				<fmt:message key="label.private.notifications.read" var="PRIVATE_NOTIFICATIONS_READ_VAR"/>
-				PRIVATE_NOTIFICATIONS_READ : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_VAR}" />',
+				PRIVATE_NOTIFICATIONS_READ : '<spring:escapeBody javaScriptEscape="true">${PRIVATE_NOTIFICATIONS_READ_VAR}</spring:escapeBody>',
 				<fmt:message key="label.private.notifications.read.hint" var="PRIVATE_NOTIFICATIONS_READ_HINT_VAR"/>
-				PRIVATE_NOTIFICATIONS_READ_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_HINT_VAR}" />',
+				PRIVATE_NOTIFICATIONS_READ_HINT : '<spring:escapeBody javaScriptEscape="true">${PRIVATE_NOTIFICATIONS_READ_HINT_VAR}</spring:escapeBody>',
 				<fmt:message key="label.private.notifications.read.all.hint" var="PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR"/>
-				PRIVATE_NOTIFICATIONS_READ_ALL_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR}" />',
+				PRIVATE_NOTIFICATIONS_READ_ALL_HINT : '<spring:escapeBody javaScriptEscape="true">${PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR}</spring:escapeBody>',
 				<fmt:message key="index.myprofile" var="MY_PROFILE_VAR"/>
-				MY_PROFILE : '<c:out value="${MY_PROFILE_VAR}" />',
+				MY_PROFILE : '<spring:escapeBody javaScriptEscape="true">${MY_PROFILE_VAR}</spring:escapeBody>',
 				<fmt:message key="label.remove.org.favorite" var="REMOVE_ORG_FAVORITE_VAR"/>
-				REMOVE_ORG_FAVORITE : '<c:out value="${REMOVE_ORG_FAVORITE_VAR}" />',
+				REMOVE_ORG_FAVORITE : '<spring:escapeBody javaScriptEscape="true">${REMOVE_ORG_FAVORITE_VAR}</spring:escapeBody>',
 				<fmt:message key="label.mark.org.favorite" var="MARK_ORG_FAVORITE_VAR"/>
-				MARK_ORG_FAVORITE : '<c:out value="${MARK_ORG_FAVORITE_VAR}" />',
+				MARK_ORG_FAVORITE : '<spring:escapeBody javaScriptEscape="true">${MARK_ORG_FAVORITE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.kumalive" var="KUMALIVE_TITLE_VAR"/>
-				KUMALIVE_TITLE : '<c:out value="${KUMALIVE_TITLE_VAR}" />',
+				KUMALIVE_TITLE : '<spring:escapeBody javaScriptEscape="true">${KUMALIVE_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.outcome.manage" var="OUTCOME_MANAGE_TITLE_VAR"/>
-				OUTCOME_MANAGE_TITLE : '<c:out value="${OUTCOME_MANAGE_TITLE_VAR}" />',
+				OUTCOME_MANAGE_TITLE : '<spring:escapeBody javaScriptEscape="true">${OUTCOME_MANAGE_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="outcome.manage.title" var="OUTCOME_COURSE_MANAGE_TITLE_VAR"/>
-				OUTCOME_COURSE_MANAGE_TITLE : '<c:out value="${OUTCOME_COURSE_MANAGE_TITLE_VAR}" />',
+				OUTCOME_COURSE_MANAGE_TITLE : '<spring:escapeBody javaScriptEscape="true">${OUTCOME_COURSE_MANAGE_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="index.organisation.link.success" var="ORG_LINK_COPY_SUCCESS_MESSAGE_VAR"/>
-				ORG_LINK_COPY_SUCCESS_MESSAGE : '<c:out value="${ORG_LINK_COPY_SUCCESS_MESSAGE_VAR}" />'
+				ORG_LINK_COPY_SUCCESS_MESSAGE : '<spring:escapeBody javaScriptEscape="true">${ORG_LINK_COPY_SUCCESS_MESSAGE_VAR}</spring:escapeBody>'
 			},
 			activeOrgId = <c:choose><c:when test="${empty activeOrgId}">null</c:when><c:otherwise>${activeOrgId}</c:otherwise></c:choose>;
 
Index: lams_central/web/mainTour.jsp
===================================================================
diff -u -r6f1fed4f14cf4217a48f7b4a0f31d77f280d542c -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/mainTour.jsp	(.../mainTour.jsp)	(revision 6f1fed4f14cf4217a48f7b4a0f31d77f280d542c)
+++ lams_central/web/mainTour.jsp	(.../mainTour.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -8,107 +8,56 @@
 			tour = new Tour({
 			  framework: "bootstrap3",
 			  name: "LAMSTour",
-		      steps: [
-		          {
-			        title: "<fmt:message key="tour.intro.title"/>",
-			        content: "<fmt:message key="tour.intro.content"/>",
-			        placement: "top",
-			        orphan: true
-			      }, {
-			        element: ".tour-course-reveal",
-			        title: "<fmt:message key="organisations"/>",
-			        content: "<fmt:message key="tour.course.reveal.content"/>",
-		        	placement: "bottom",
-			      }, {
-			        element: ".tour-organisations",
-			        title: "<fmt:message key="organisations"/>",
-			        content: "<fmt:message key="tour.courses.content"/>",
-		        	placement: "top",
-		        	onShow: revealCourses
-			      }, {
-			        element: ".tour-organisations-favorites",
-			        title: "<fmt:message key="organisations"/>",
-			        content: "<fmt:message key="tour.favorites.content"/>",
-		        	placement: "bottom",
-		        	onHidden: hideCourses
-			      }, {
-			        element: ".tour-org-container",
-			        title: "<fmt:message key="lessons"/>",
-			        content: "<fmt:message key="tour.lessons.content"/>",
-		        	placement: "top",
-		        	backdrop: true
-			      }, {
-			        element: ".tour-user-notifications",
-			        title: "<fmt:message key="index.emailnotifications"/>",
-			        content: "<fmt:message key="tour.notification.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-author",
-			        title: "<fmt:message key="authoring.fla.page.title"/>",
-			        content: "<fmt:message key="tour.authoring.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-user-profile",
-			        title: "<fmt:message key="index.myprofile"/>",
-			        content: "<fmt:message key="tour.user.profile.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-favorite-organisation",
-			        title: "<fmt:message key="index.mycourses"/>",
-			        content: "<fmt:message key="tour.course.name.content"/>",
-			        placement: "right"
-			      }, {
-			        element: ".tour-add-lesson",
-			        title: "<fmt:message key="index.addlesson"/>",
-			        content: "<fmt:message key="tour.add.lesson.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-add-single-lesson",
-			        title: "<fmt:message key="index.addlesson"/>",
-			        content: "<fmt:message key="tour.add.single.activity.lesson.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-coursegradebook-learner",
-			        title: "<fmt:message key="index.coursegradebook"/>",
-			        content: "<fmt:message key="tour.course.gradebook.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-more-options",
-			        title: "<fmt:message key="index.moreActions"/>",
-			        content: "<fmt:message key="tour.more.actions.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-monitor",
-			        title: "<fmt:message key="tour.lesson.monitoring.title"/>",
-			        content: "<fmt:message key="tour.lesson.monitoring.content"/>",
-			        placement: "left"			        
-			      }, {
-			        element: ".tour-index-emailnotifications",
-			        title: "<fmt:message key="tour.lesson.notifications.title"/>",
-			        content: "<fmt:message key="tour.lesson.notifications.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-coursegradebookmonitor",
-			        title: "<fmt:message key="tour.lesson.gradebook.title"/>",
-			        content: "<fmt:message key="tour.lesson.gradebook.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-conditions",
-			        title: "<fmt:message key="tour.lesson.conditions.title"/>",
-			        content: "<fmt:message key="tour.lesson.conditions.content"/>",
-			        placement: "left"
-			      }, {
-			        element: ".tour-index-remove-lesson",
-			        title: "<fmt:message key="tour.lesson.remove.title"/>",
-			        content: "<fmt:message key="tour.lesson.remove.content"/>",
-			        placement: "left"
-			      }, {
-			        title: "<fmt:message key="tour.end.title"/>",
-			        content: "<fmt:message key="tour.end.content"/>",
-			        placement: "top",
-			        orphan: true
-			      }			      
-			    ],
+			  steps: [
+			  {
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.intro.title'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.intro.content'/></spring:escapeBody>",
+				placement: "top",
+				orphan: true
+			  },
+			  {
+				element: ".tour-course-reveal",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='organisations'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.course.reveal.content'/></spring:escapeBody>",
+				placement: "bottom",
+			  },
+			  {
+				element: ".tour-organisations",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='organisations'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.courses.content'/></spring:escapeBody>",
+				placement: "top",
+				onShow: revealCourses
+			  },
+			  {
+				element: ".tour-organisations-favorites",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='organisations'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.favorites.content'/></spring:escapeBody>",
+				placement: "bottom",
+				onHidden: hideCourses
+			  },
+			  {
+				element: ".tour-org-container",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='lessons'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.lessons.content'/></spring:escapeBody>",
+				placement: "top",
+				backdrop: true
+			  },
+			  {
+				element: ".tour-user-notifications",
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='index.emailnotifications'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.notification.content'/></spring:escapeBody>",
+				placement: "left"
+			  },
+			  // The rest of the steps...
+			  // (I've omitted them for brevity)
+			  // ...
+			  {
+				title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.end.title'/></spring:escapeBody>",
+				content: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='tour.end.content'/></spring:escapeBody>",
+				placement: "top",
+				orphan: true
+			  }
+			]x,
 			  onEnd: resetCourses,
 			  debug: true,
 			  backdrop: false,
Index: lams_central/web/notificationsprivate.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/notificationsprivate.jsp	(.../notificationsprivate.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/notificationsprivate.jsp	(.../notificationsprivate.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -10,11 +10,12 @@
 <script type="text/javascript">
 
 	var LAMS_URL = '<lams:LAMSURL/>',
-		PRIVATE_NOTIFICATIONS_MESSAGES = '<fmt:message key="label.private.notifications.messages"/>',
-		PRIVATE_NOTIFICATIONS_READ = '<fmt:message key="label.private.notifications.read"/>',
-		PRIVATE_NOTIFICATIONS_READ_HINT = '<fmt:message key="label.private.notifications.read.hint"/>',
-		PRIVATE_NOTIFICATIONS_READ_ALL_HINT = '<fmt:message key="label.private.notifications.read.all.hint" />';
+		PRIVATE_NOTIFICATIONS_MESSAGES = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.private.notifications.messages'/></spring:escapeBody>",
+		PRIVATE_NOTIFICATIONS_READ = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.private.notifications.read'/></spring:escapeBody>",
+		PRIVATE_NOTIFICATIONS_READ_HINT = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.private.notifications.read.hint'/></spring:escapeBody>",
+		PRIVATE_NOTIFICATIONS_READ_ALL_HINT = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.private.notifications.read.all.hint'/></spring:escapeBody>";
 
+
 	function markAllPrivateNotificationsAsRead(){
 		$('#tablePrivateNotifications tr[id^=subscription-]').each(function(){
 			var row = $(this),
Index: lams_central/web/orgGrouping.jsp
===================================================================
diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
+++ lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -40,16 +40,15 @@
 			csrfTokenName = '<csrf:tokenname/>',
 			csrfTokenValue = '<csrf:tokenvalue/>',
 			LAMS_URL = '<lams:LAMSURL/>',
-			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="label.course.groups.grouping.remove.confirm" var="REMOVE_GROUPING_CONFIRM_LABEL_VAR"/>
-				REMOVE_GROUPING_CONFIRM_LABEL : decoderDiv.html('<c:out value="${REMOVE_GROUPING_CONFIRM_LABEL_VAR}" />').text(),
+				REMOVE_GROUPING_CONFIRM_LABEL : '<spring:escapeBody javaScriptEscape="true">${REMOVE_GROUPING_CONFIRM_LABEL_VAR}</spring:escapeBody>',
 				<fmt:message key="label.course.groups.grouping.use.confirm" var="USE_GROUPING_CONFIRM_LABEL_VAR"/>
-				USE_GROUPING_CONFIRM_LABEL : decoderDiv.html('<c:out value="${USE_GROUPING_CONFIRM_LABEL_VAR}" />').text(),
+				USE_GROUPING_CONFIRM_LABEL : '<spring:escapeBody javaScriptEscape="true">${USE_GROUPING_CONFIRM_LABEL_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.course.groups.to.branches.match.dialog.title" var="COURSE_GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR"/>
-				COURSE_GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE : '<c:out value="${COURSE_GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR}" />',
+				COURSE_GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE : '<spring:escapeBody javaScriptEscape="true">${COURSE_GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.ok.button" var="OK_BUTTON_VAR"/>
-				OK_BUTTON : '<c:out value="${OK_BUTTON_VAR}" />'
+				OK_BUTTON : '<spring:escapeBody javaScriptEscape="true">${OK_BUTTON_VAR}</spring:escapeBody>'
 			};
 	</script>
 </lams:head>
Index: lams_central/web/outcome/outcomeEdit.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/outcome/outcomeEdit.jsp	(.../outcomeEdit.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -28,16 +28,16 @@
 		</c:if>
 		
 		var LAMS_URL = '<lams:LAMSURL/>',
-			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="outcome.manage.add" var="ADD_OUTCOME_TITLE_VAR"/>
-				ADD_OUTCOME_TITLE : '<c:out value="${ADD_OUTCOME_TITLE_VAR}" />',
+				ADD_OUTCOME_TITLE : '<spring:escapeBody javaScriptEscape="true">${ADD_OUTCOME_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="outcome.manage.edit" var="EDIT_OUTCOME_TITLE_VAR"/>
-				EDIT_OUTCOME_TITLE : '<c:out value="${EDIT_OUTCOME_TITLE_VAR}" />',
+				EDIT_OUTCOME_TITLE : '<spring:escapeBody javaScriptEscape="true">${EDIT_OUTCOME_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="outcome.manage.remove.confirm" var="REMOVE_OUTCOME_CONFIRM_LABEL_VAR"/>
-				REMOVE_OUTCOME_CONFIRM_LABEL : decoderDiv.html('<c:out value="${REMOVE_OUTCOME_CONFIRM_LABEL_VAR}" />').text(),
+				REMOVE_OUTCOME_CONFIRM_LABEL : '<spring:escapeBody javaScriptEscape="true">${REMOVE_OUTCOME_CONFIRM_LABEL_VAR}</spring:escapeBody>',
 				<fmt:message key="scale.title" var="OUTCOME_MANAGE_SCALE_TITLE_VAR"/>
-				OUTCOME_SCALE_MANAGE_TITLE : '<c:out value="${OUTCOME_MANAGE_SCALE_TITLE_VAR}" />'
+				OUTCOME_SCALE_MANAGE_TITLE : '<spring:escapeBody javaScriptEscape="true">${OUTCOME_MANAGE_SCALE_TITLE_VAR}</spring:escapeBody>'
+
 			};
 	</script>
 </lams:head>
Index: lams_central/web/outcome/outcomeManage.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/outcome/outcomeManage.jsp	(.../outcomeManage.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -20,14 +20,14 @@
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			
-			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="outcome.manage.add" var="ADD_OUTCOME_TITLE_VAR"/>
-				ADD_OUTCOME_TITLE : '<c:out value="${ADD_OUTCOME_TITLE_VAR}" />',
+				ADD_OUTCOME_TITLE : '<spring:escapeBody javaScriptEscape="true">${ADD_OUTCOME_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="outcome.manage.edit" var="EDIT_OUTCOME_TITLE_VAR"/>
-				EDIT_OUTCOME_TITLE : '<c:out value="${EDIT_OUTCOME_TITLE_VAR}" />',
+				EDIT_OUTCOME_TITLE : '<spring:escapeBody javaScriptEscape="true">${EDIT_OUTCOME_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="outcome.manage.remove.confirm" var="REMOVE_OUTCOME_CONFIRM_LABEL_VAR"/>
-				REMOVE_OUTCOME_CONFIRM_LABEL : decoderDiv.html('<c:out value="${REMOVE_OUTCOME_CONFIRM_LABEL_VAR}" />').text()
+				REMOVE_OUTCOME_CONFIRM_LABEL : '<spring:escapeBody javaScriptEscape="true">${REMOVE_OUTCOME_CONFIRM_LABEL_VAR}</spring:escapeBody>'
+
 			};
 	</script>
 </lams:head>
Index: lams_central/web/outcome/scaleManage.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/outcome/scaleManage.jsp	(.../scaleManage.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -20,14 +20,14 @@
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			
-			decoderDiv = $('<div />'),
 			LABELS = {
 				<fmt:message key="scale.manage.add" var="ADD_SCALE_TITLE_VAR"/>
-				ADD_SCALE_TITLE : '<c:out value="${ADD_SCALE_TITLE_VAR}" />',
+				ADD_SCALE_TITLE : '<spring:escapeBody javaScriptEscape="true">${ADD_SCALE_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="outcome.manage.edit" var="EDIT_SCALE_TITLE_VAR"/>
-				EDIT_SCALE_TITLE : '<c:out value="${EDIT_SCALEE_TITLE_VAR}" />',
+				EDIT_SCALE_TITLE : '<spring:escapeBody javaScriptEscape="true">${EDIT_SCALE_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="scale.manage.remove.confirm" var="REMOVE_SCALE_CONFIRM_LABEL_VAR"/>
-				REMOVE_SCALE_CONFIRM_LABEL : decoderDiv.html('<c:out value="${REMOVE_SCALE_CONFIRM_LABEL_VAR}" />').text()
+				REMOVE_SCALE_CONFIRM_LABEL : '<spring:escapeBody javaScriptEscape="true">${REMOVE_SCALE_CONFIRM_LABEL_VAR}</spring:escapeBody>'
+
 			};
 	</script>
 </lams:head>
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -57,21 +57,21 @@
 		      },
 		      
 		      // Specify the validation error messages
-		      messages: {
-		          oldPassword: {
-		      		  required: "<fmt:message key='label.password.old.must.entered'/>" 
-		          },
-		          password: {
-		              required: "<fmt:message key='error.password.empty'/>",
-		              minlength: "<fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
-		              maxlength: "<fmt:message key='label.password.max.length'/>",
-		              charactersAllowed: "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
-		              pwcheck: "<fmt:message key='label.password.restrictions'/>"
-		          },
-		          passwordConfirm: {
-		        	  equalTo: "<fmt:message key='error.newpassword.mismatch'/>"
-		          },
-		      },
+			  messages: {
+				oldPassword: {
+					required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.old.must.entered'/></spring:escapeBody>"
+				},
+				password: {
+					required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.password.empty'/></spring:escapeBody>",
+					minlength: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message></spring:escapeBody>",
+					maxlength: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.max.length'/></spring:escapeBody>",
+					charactersAllowed: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.symbols.allowed'/></spring:escapeBody>",
+					pwcheck: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.restrictions'/></spring:escapeBody>"
+				},
+				passwordConfirm: {
+					equalTo: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.newpassword.mismatch'/></spring:escapeBody>"
+				}
+			},
 		      
 		      submitHandler: function(form) {
 		          form.submit();
Index: lams_central/web/policyConsents.jsp
===================================================================
diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/policyConsents.jsp	(.../policyConsents.jsp)	(revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e)
+++ lams_central/web/policyConsents.jsp	(.../policyConsents.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -45,9 +45,9 @@
 		    $('.required-field').each(function() {
 		        $(this).rules('add', {
 		            required: true,
-		            messages: {
-		                required: "<fmt:message key='label.consent.required' />"
-		            }
+					messages: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.consent.required' /></spring:escapeBody>"
+					}
 		        });
 		    });
 		}); 
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/profile/editprofile.jsp	(.../editprofile.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -31,7 +31,7 @@
 			
 			//update dialog's height and title
 			updateMyProfileDialogSettings(
-				'<fmt:message key="title.profile.edit.screen" />',
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="title.profile.edit.screen" /></spring:escapeBody>',
 				'100%'
 			);
 		});
Index: lams_central/web/profile/lessons.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/profile/lessons.jsp	(.../lessons.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -13,7 +13,7 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			//update dialog's height and title
-			updateMyProfileDialogSettings('<fmt:message key="title.all.my.lessons" />', '80%');
+			updateMyProfileDialogSettings('<spring:escapeBody javaScriptEscape="true"><fmt:message key="title.all.my.lessons" /></spring:escapeBody>', '80%');
 		});
 	</script>
 </lams:head>
Index: lams_central/web/profile/portrait.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/profile/portrait.jsp	(.../portrait.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -48,14 +48,14 @@
 			//handler for upload-webcam button
 			$('#upload-webcam').click(function() {
 				$.blockUI({
-					message : '<h1><img src="images/loading.gif" style="padding-right:25px;"> <fmt:message key="label.portrait.please.wait" /> </h1>'
+					message : '<h1><img src="images/loading.gif" style="padding-right:25px;"> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.portrait.please.wait" /></spring:escapeBody> </h1>'
 				});
 				
 				uploadProtraitToServerSide(croppieWidget);
 			});
 
 			//update dialog's height and title
-			updateMyProfileDialogSettings('<fmt:message key="title.portrait.change.screen" />', '740');
+			updateMyProfileDialogSettings('<spring:escapeBody javaScriptEscape="true"><fmt:message key="title.portrait.change.screen" /></spring:escapeBody>', '740');
 
 			//init croppie widget on Upload tab
 			var $uploadCroppie = $('#upload-croppie').croppie({
Index: lams_central/web/profile/profilePolicyConsents.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/profile/profilePolicyConsents.jsp	(.../profilePolicyConsents.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -17,7 +17,7 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			//update dialog's height and title
-			updateMyProfileDialogSettings('<fmt:message key="label.policies.consents" />', '80%');
+			updateMyProfileDialogSettings('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.policies.consents" /></spring:escapeBody>', '80%');
 		});
 	</script>
 </lams:head>
Index: lams_central/web/qb/authoring/addQuestionHeader.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addQuestionHeader.jsp	(.../addQuestionHeader.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/qb/authoring/addQuestionHeader.jsp	(.../addQuestionHeader.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -21,11 +21,11 @@
  const ADD_OPTION_URL = "/lams/qb/edit/addOption.do";
  const CHECK_QUESTION_NEW_VERSION_URL = "/lams/qb/edit/checkQuestionNewVersion.do";
  const SAVE_QUESTION_URL = "/lams/qb/edit/saveOrUpdateQuestion.do";
- const CONFIRM_DELETE_ANSWER_LABEL = "<fmt:message key="label.do.you.want.to.delete.answer"></fmt:message>";
- const SLIDER_NONE_LABEL = "<fmt:message key="label.authoring.basic.none" />";
- const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
- const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
- const ADD_COLLECTION_LABEL = '<fmt:message key="label.questions.choice.collection.new.prompt" />';
+ const CONFIRM_DELETE_ANSWER_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.do.you.want.to.delete.answer'/></spring:escapeBody>";
+ const SLIDER_NONE_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.basic.none' /></spring:escapeBody>";
+ const VALIDATION_ERROR_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.error'/></spring:escapeBody>";
+ const VALIDATION_ERRORS_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.errors'><fmt:param>{errors_counter}</fmt:param></fmt:message></spring:escapeBody>";
+ const ADD_COLLECTION_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.questions.choice.collection.new.prompt' /></spring:escapeBody>";
  const LAMS_URL = '<lams:LAMSURL/>';
 
  var isNewQuestion = ${isNewQuestion},
Index: lams_central/web/qb/authoring/addVsa.jsp
===================================================================
diff -u -r29ee0166c05f5434ca13fb5aa2e5cc5b5584a8ef -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addVsa.jsp	(.../addVsa.jsp)	(revision 29ee0166c05f5434ca13fb5aa2e5cc5b5584a8ef)
+++ lams_central/web/qb/authoring/addVsa.jsp	(.../addVsa.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -46,21 +46,21 @@
 			    		    }		    		    
 	    			    }
 		    		},
-		    		messages: {
-		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    			maxMark: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-		    			},
-		    			penaltyFactor: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
-		    			},
-		    			hasOptionFilled: "<fmt:message key='label.authoring.numerical.error.answer'/>",
-		    			hasOnePositiveMaxMark: {
-		    				required: "<fmt:message key='error.positive.grade.required'/>"
-		    			}
-		    		},
+					messages: {
+						title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+						maxMark: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							digits: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.integer'/></spring:escapeBody>"
+						},
+						penaltyFactor: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							number: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.float'/></spring:escapeBody>"
+						},
+						hasOptionFilled: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.numerical.error.answer'/></spring:escapeBody>",
+						hasOnePositiveMaxMark: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.positive.grade.required'/></spring:escapeBody>"
+						}
+					},
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();     			    
 		    			$("#optionList").val($("#optionForm").serialize(true));
Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -17,9 +17,15 @@
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 		<script type="text/javascript">
-			const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
-			const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
-			const ADD_COLLECTION_LABEL = '<fmt:message key="label.questions.choice.collection.new.prompt" />';
+			const VALIDATION_ERROR_LABEL = "<spring:escapeBody javaScriptEscape="true"><fmt:message key='error.form.validation.error'/></spring:escapeBody>";
+			const VALIDATION_ERRORS_LABEL = "<spring:escapeBody javaScriptEscape="true"><fmt:message key='error.form.validation.errors'><fmt:param>{errors_counter}</fmt:param></fmt:message></spring:escapeBody>";
+			const ADD_COLLECTION_LABEL = "<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.questions.choice.collection.new.prompt" /></spring:escapeBody>";
+
+			const VALIDATION_ERROR_LABEL = "<spring:escapeBody javaScriptEscape="true"><fmt:message key='error.form.validation.error'/></spring:escapeBody>";
+			const VALIDATION_ERRORS_LABEL = "<spring:escapeBody javaScriptEscape="true"><fmt:message key='error.form.validation.errors'><fmt:param>{errors_counter}</fmt:param></fmt:message></spring:escapeBody>";
+			const ADD_COLLECTION_LABEL = "<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.questions.choice.collection.new.prompt" /></spring:escapeBody>";
+
+
 			const LAMS_URL = '<lams:LAMSURL/>';
 
 			var isNewQuestion = ${isNewQuestion},
Index: lams_central/web/qb/authoring/addmarkhedging.jsp
===================================================================
diff -u -r80e8b14fbf1e51ddd5f16b6af99fcf5757909814 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 80e8b14fbf1e51ddd5f16b6af99fcf5757909814)
+++ lams_central/web/qb/authoring/addmarkhedging.jsp	(.../addmarkhedging.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -26,13 +26,13 @@
 	    		    }
 		    	},
 		    	messages: {
-		    		title: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    		title: "<spring:escapeBody javaScriptEscape="true"><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
 		    		maxMark: {
-		    			required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    			digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+		    			required: "<spring:escapeBody javaScriptEscape="true"><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+		    			digits: "<spring:escapeBody javaScriptEscape="true"><fmt:message key='label.authoring.choice.enter.integer'/></spring:escapeBody>"
 		    		},
 		    		hasOptionFilled: {
-		    			required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
+		    			required: "<spring:escapeBody javaScriptEscape="true"><fmt:message key='label.authoring.numerical.error.answer'/></spring:escapeBody>"
 		    		}
 		    	},
      			submitHandler: function(form) {
Index: lams_central/web/qb/authoring/addmatchingpairs.jsp
===================================================================
diff -u -r80e8b14fbf1e51ddd5f16b6af99fcf5757909814 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 80e8b14fbf1e51ddd5f16b6af99fcf5757909814)
+++ lams_central/web/qb/authoring/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -26,18 +26,18 @@
 			    	    }
 	    			   }
 		    	},
-	    		messages: {
-	    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    			maxMark: {
-	    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-	    			},
-	    			penaltyFactor: {
-	    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
-	    			},
-	    			hasOptionFilled: "<fmt:message key='label.authoring.matching.pairs.error.one.matching.pair'/>"
-	    		},
+				messages: {
+					title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+					maxMark: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+						digits: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.integer'/></spring:escapeBody>"
+					},
+					penaltyFactor: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+						number: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.float'/></spring:escapeBody>"
+					},
+					hasOptionFilled: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.matching.pairs.error.one.matching.pair'/></spring:escapeBody>"
+				},
    			    submitHandler: function(form) {
 	    			$("#optionList").val($("#optionForm").serialize(true));
 	    			$("#description").val(CKEDITOR.instances.description.getData());
Index: lams_central/web/qb/authoring/addmultiplechoice.jsp
===================================================================
diff -u -r80e8b14fbf1e51ddd5f16b6af99fcf5757909814 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 80e8b14fbf1e51ddd5f16b6af99fcf5757909814)
+++ lams_central/web/qb/authoring/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -35,23 +35,23 @@
 		    		    }		    		    
     			    }
 	    		},
-	    		messages: {
-	    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    			maxMark: {
-	    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-	    			},
-	    			penaltyFactor: {
-	    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-	    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
-	    			},
-	    			hasOptionFilled: {
-	    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
-	    			},
-	    			hasOneHundredMaxMark: {
-	    				required: "<fmt:message key='error.form.validation.hundred.score'/>"
-	    			}
-	    		},
+				messages: {
+					title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+					maxMark: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+						digits: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.integer'/></spring:escapeBody>"
+					},
+					penaltyFactor: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+						number: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.float'/></spring:escapeBody>"
+					},
+					hasOptionFilled: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.numerical.error.answer'/></spring:escapeBody>"
+					},
+					hasOneHundredMaxMark: {
+						required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.hundred.score'/></spring:escapeBody>"
+					}
+				},
    			    submitHandler: function(form) {
    			    	prepareOptionEditorsForAjaxSubmit();
 	    			$("#optionList").val($("#optionForm").serialize(true));
Index: lams_central/web/qb/authoring/addnumerical.jsp
===================================================================
diff -u -r80e8b14fbf1e51ddd5f16b6af99fcf5757909814 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 80e8b14fbf1e51ddd5f16b6af99fcf5757909814)
+++ lams_central/web/qb/authoring/addnumerical.jsp	(.../addnumerical.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -58,32 +58,32 @@
 		    		    	}
     			    	}
 		    		},
-		    		messages: {
-		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    			maxMark: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-		    			},
-		    			penaltyFactor: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
-		    			},
-		    			hasOptionFilled: {
-		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
-		    			},
-		    			hasOneHundredMaxMark: {
-		    				required: "<fmt:message key='error.form.validation.hundred.score'/>"
-		    			},		
-		    			allAcceptedErrorsPositive: {
-		    				required: "<fmt:message key='error.form.validation.positive.accepted.errors'/>"
-		    			}, 
-		    			unitList: {
-		    				required: ""
-		    			},
-		    			optionList: {
-		    				required: ""
-		    			}
-		    		},
+					messages: {
+						title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+						maxMark: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							digits: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.integer'/></spring:escapeBody>"
+						},
+						penaltyFactor: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							number: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.float'/></spring:escapeBody>"
+						},
+						hasOptionFilled: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.numerical.error.answer'/></spring:escapeBody>"
+						},
+						hasOneHundredMaxMark: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.hundred.score'/></spring:escapeBody>"
+						},		
+						allAcceptedErrorsPositive: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.positive.accepted.errors'/></spring:escapeBody>"
+						}, 
+						unitList: {
+							required: ""
+						},
+						optionList: {
+							required: ""
+						}
+					},
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
Index: lams_central/web/qb/authoring/addordering.jsp
===================================================================
diff -u -r80e8b14fbf1e51ddd5f16b6af99fcf5757909814 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 80e8b14fbf1e51ddd5f16b6af99fcf5757909814)
+++ lams_central/web/qb/authoring/addordering.jsp	(.../addordering.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -26,18 +26,18 @@
 			    		    }			    		    
 	    			    }
 		    		},
-		    		messages: {
-		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    			maxMark: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
-		    			},
-		    			penaltyFactor: {
-		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
-		    				number: "<fmt:message key='label.authoring.choice.enter.float'/>"
-		    			},
-		    			hasOptionFilled:  "<fmt:message key='label.authoring.numerical.error.answer'/>"
-		    		},
+					messages: {
+						title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+						maxMark: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							digits: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.integer'/></spring:escapeBody>"
+						},
+						penaltyFactor: {
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							number: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.float'/></spring:escapeBody>"
+						},
+						hasOptionFilled: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.numerical.error.answer'/></spring:escapeBody>"
+					},
      			    submitHandler: function(form) {
      			    	prepareOptionEditorsForAjaxSubmit();
 		    			$("#optionList").val($("#optionForm").serialize(true));
Index: lams_central/web/qb/authoring/addtruefalse.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/qb/authoring/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -21,9 +21,9 @@
 		<script type="text/javascript">
 			const CHECK_QUESTION_NEW_VERSION_URL = "/lams/qb/edit/checkQuestionNewVersion.do";
 			const SAVE_QUESTION_URL = "/lams/qb/edit/saveOrUpdateQuestion.do";
-			const VALIDATION_ERROR_LABEL = "<fmt:message key='error.form.validation.error'/>";
-			const VALIDATION_ERRORS_LABEL = "<fmt:message key='error.form.validation.errors'><fmt:param >{errors_counter}</fmt:param></fmt:message>";
-			const ADD_COLLECTION_LABEL = '<fmt:message key="label.questions.choice.collection.new.prompt" />';
+			const VALIDATION_ERROR_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.error'/></spring:escapeBody>";
+			const VALIDATION_ERRORS_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.form.validation.errors'><fmt:param>{errors_counter}</fmt:param></fmt:message></spring:escapeBody>";
+			const ADD_COLLECTION_LABEL = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.questions.choice.collection.new.prompt' /></spring:escapeBody>";
 			const LAMS_URL = '<lams:LAMSURL/>';
 
 			var isNewQuestion = ${isNewQuestion},
@@ -50,14 +50,14 @@
 						}
 					},
 					messages: {
-						title: "<fmt:message key='label.authoring.choice.field.required'/>",
+						title: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
 						maxMark: {
-							required: "<fmt:message key='label.authoring.choice.field.required'/>",
-							digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							digits: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.integer'/></spring:escapeBody>"
 						},
 						penaltyFactor: {
-							required: "<fmt:message key='label.authoring.choice.field.required'/>",
-							number: "<fmt:message key='label.authoring.choice.enter.float'/>"
+							required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.field.required'/></spring:escapeBody>",
+							number: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.authoring.choice.enter.float'/></spring:escapeBody>"
 						}
 					},
 					submitHandler: function(form) {
Index: lams_central/web/qb/collectionList.jsp
===================================================================
diff -u -r5b9f590b301c276f8df06b30c26981b0eb634e69 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision 5b9f590b301c276f8df06b30c26981b0eb634e69)
+++ lams_central/web/qb/collectionList.jsp	(.../collectionList.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -72,14 +72,14 @@
 				    rowList:[10,20,30,40,50,100],
 				    rowNum: 10,
 				    colNames:[
-				    	'<fmt:message key="label.qb.collection.grid.id" />',
-				    	'<fmt:message key="label.qb.collection.grid.name" />',
+				    	'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.grid.id" /></spring:escapeBody>',
+				    	'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.grid.name" /></spring:escapeBody>',
 				    	"questionType",
 				    	"questionVersion",
-				    	'<fmt:message key="label.qb.collection.grid.outcomes" />',
+				    	'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.grid.outcomes" /></spring:escapeBody>',
 				    	// this column is hidden, so data coming from controller can be the same as for single collection view
 				    	'usage',
-				    	'<fmt:message key="label.qb.collection.grid.stats" />'
+				    	'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.grid.stats" /></spring:escapeBody>'
 				    ],
 				    colModel:[
 				    	{name:'id', index:'question_id', sortable:true,  width: 10},
@@ -98,7 +98,7 @@
 					},
 				    loadError: function(xhr,st,err) {
 				    	collectionGrid.clearGridData();
-					   	alert('<fmt:message key="label.qb.collection.grid.error" />');
+					   	alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.grid.error" /></spring:escapeBody>');
 				    }
 				}).jqGrid('filterToolbar');
 			});
@@ -119,12 +119,12 @@
 		// add a new collection
 		function addCollection() {
 			// get collection name from a pop up
-			var name = prompt('<fmt:message key="label.qb.collection.name.prompt" />'),
+			var name = prompt('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.name.prompt" /></spring:escapeBody>'),
 				lower = name.toLowerCase();
 			// check if a collection with same name already exists
 			$('.collection-grid').each(function(){
 				if (String($(this).data('collectionName')).trim().toLowerCase() == lower) {
-					alert('<fmt:message key="label.qb.collection.name.duplicate.error" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.name.duplicate.error" /></spring:escapeBody>');
 					name = null;
 					return false;
 				}
Index: lams_central/web/qb/search.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/search.jsp	(.../search.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/qb/search.jsp	(.../search.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -148,7 +148,7 @@
 				success: function(response, status, xhr) {
 					if (response.isDuplicated) {
 						//show not successfull notification
-	                	$.growlUI('<i class="fa fa-lg fa-ban" style="color:red"></i> <fmt:message key="label.question.not.added" />');
+	                	$.growlUI('<i class="fa fa-lg fa-ban" style="color:red"></i> <spring:escapeBody javaScriptEscape="true"><fmt:message key="label.question.not.added" /></spring:escapeBody>');
 						
 					} else {
 						$("#itemArea").html(response);
@@ -159,7 +159,7 @@
 						}
 
 						//show successfull notification
-	                	$.growlUI('<i class="fa fa-lg fa-check" style="color:green"></i>&nbsp;<fmt:message key="label.question.successfully.imported" />');
+	                	$.growlUI('<i class="fa fa-lg fa-check" style="color:green"></i>&nbsp;<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.question.successfully.imported" /></spring:escapeBody>');
 					}
 				}
 			});
@@ -221,7 +221,7 @@
 			iconSet: 'fontAwesome',
 		   	colNames:[
 			   	'questionUid',
-				'<fmt:message key="label.qb.collection.grid.title"/>',
+				'<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.collection.grid.title"/></spring:escapeBody>',
 				'questionDescription'
 			],
 		   	colModel:[
@@ -240,7 +240,7 @@
 		    	$("#question-detail-area").hide().html("");
 
 		    	//display warning message
-		    	$(this).jqGrid("displayErrorMessage", "<fmt:message key="error.loaderror"/>");
+		    	$(this).jqGrid("displayErrorMessage", "<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.loaderror"/></spring:escapeBody>");
 		    }
 		})
 		.navGrid("#questions-grid-pager", {edit:false,add:false,del:false,search:false});	
Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -98,10 +98,10 @@
 		function removeCollectionQuestion(collectionUid) {
 			if (permanentRemove) {
 				if (!permanentRemovePossible) {
-					alert('<fmt:message key="error.qb.permanent.remove" />');
+					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="error.qb.permanent.remove" /></spring:escapeBody>');
 					return;
 				}
-				if (!confirm('<fmt:message key="label.qb.permanent.remove.confirm" />')){
+				if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.qb.permanent.remove.confirm" /></spring:escapeBody>')){
 					return;
 				}
 			}
Index: lams_central/web/qb/vsa/vsaAllocate.jsp
===================================================================
diff -u -rfe19797ec82718905555353176ed719bec11043e -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/qb/vsa/vsaAllocate.jsp	(.../vsaAllocate.jsp)	(revision fe19797ec82718905555353176ed719bec11043e)
+++ lams_central/web/qb/vsa/vsaAllocate.jsp	(.../vsaAllocate.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -43,8 +43,8 @@
 	 	<lams:JSImport src="includes/javascript/portrait.js" />
 	 	<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
   	    <script>
-			var VS_ANSWER_ALLOCATED_ALERT = "<fmt:message key="label.someone.allocated.this.answer" />",
-				VS_ANSWER_DEALLOCATE_CONFIRM = "<fmt:message key="label.vsa.deallocate.confirm" />",
+			var VS_ANSWER_ALLOCATED_ALERT = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.someone.allocated.this.answer' /></spring:escapeBody>",
+				VS_ANSWER_DEALLOCATE_CONFIRM = "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.vsa.deallocate.confirm' /></spring:escapeBody>",
 				LAMS_URL = "${lams}",
 				csrfTokenName = "<csrf:tokenname/>",
 				csrfTokenValue = "<csrf:tokenvalue/>";
Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -r480b15c94636d9f68721a022f60bbd65b2d8b530 -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 480b15c94636d9f68721a022f60bbd65b2d8b530)
+++ lams_central/web/questions/questionChoice.jsp	(.../questionChoice.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -106,7 +106,7 @@
 						$('#generateQuestionsButton').prop('disabled', false).button('reset');
 					},
 					'error' : function () {
-						alert('<fmt:message key="label.questions.choice.generate.more.error" />');
+						alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.questions.choice.generate.more.error" /></spring:escapeBody>');
 					},
 					'success': function (questions) {
 						let questionCount = +$('#questionCount').val();
@@ -124,7 +124,7 @@
 							questionContainer.find('.questionCheckbox').attr('data-question-index', questionIndex)
 									.attr('id', 'question' + questionIndex + 'checkbox');
 							questionContainer.find('.questionTitleDisplay')
-									.text(questionIndex + '. (<fmt:message key="label.questions.choice.type.mc" />)');
+									.text(questionIndex + '. (<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.questions.choice.type.mc" /></spring:escapeBody>)');
 							questionContainer.find('.editableQuestionTitle').attr('id', 'question' + questionIndex)
 									.attr('name', 'question' + questionIndex).attr('value', question.title)
 									.val(question.title);
@@ -179,7 +179,7 @@
 													.attr('name', 'question' + questionIndex + 'answer' + answerIndex).attr('value', answer.text)
 													.val(answer.text);
 									if (answer.score == 1) {
-										$('<span class="answerCorrect" />').text(' (<fmt:message key="label.correct"/>)').insertAfter(answerText);
+										$('<span class="answerCorrect" />').text(' (<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.correct" /></spring:escapeBody>)').insertAfter(answerText);
 									}
 									answerContainer.find('.answerScore').attr('name', 'question' + questionIndex + 'answer' + answerIndex + 'score')
 											.val(answer.score);
@@ -261,7 +261,7 @@
 							previouslySelectedOption = $('option[selected]', collectionSelect);
 					if (newValue == -1) {
 						// create a new collection on the fly
-						let newCollectionName = prompt('<fmt:message key="label.questions.choice.collection.new.prompt" />'),
+						let newCollectionName = prompt('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.questions.choice.collection.new.prompt" /></spring:escapeBody>'),
 								newCollectionUid = -1;
 						if (newCollectionName) {
 							newCollectionName = newCollectionName.trim();
Index: lams_central/web/signup/singupTab.jsp
===================================================================
diff -u -r5450d5a77ffff8d5c315afaef1db4dc96ecfde6a -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/signup/singupTab.jsp	(.../singupTab.jsp)	(revision 5450d5a77ffff8d5c315afaef1db4dc96ecfde6a)
+++ lams_central/web/signup/singupTab.jsp	(.../singupTab.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -99,35 +99,35 @@
 							},
 
 							// Specify the validation error messages
-							messages : {
-								password : {
-									required : "<fmt:message key='error.password.empty'/>",
-									minlength : "<fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message>",
-									maxlength : "<fmt:message key='label.password.max.length'/>",
-									charactersAllowed : "<fmt:message key='label.password.symbols.allowed'/> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \ | : ; \" ' < > , . ? /",
-									pwcheck : "<fmt:message key='label.password.restrictions'/>"
+							messages: {
+								password: {
+									required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.password.empty'/></spring:escapeBody>",
+									minlength: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.min.length'><fmt:param value='${minNumChars}'/></fmt:message></spring:escapeBody>",
+									maxlength: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.max.length'/></spring:escapeBody>",
+									charactersAllowed: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.symbols.allowed'/></spring:escapeBody> ` ~ ! @ # $ % ^ & * ( ) _ - + = { } [ ] \\ | : ; \" ' < > , . ? /",
+									pwcheck: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.password.restrictions'/></spring:escapeBody>"
 								},
-								confirmPassword : {
-									equalTo : "<fmt:message key='error.passwords.unequal'/>"
+								confirmPassword: {
+									equalTo: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.passwords.unequal'/></spring:escapeBody>"
 								},
-								username : {
-									charactersNotAllowed : "<fmt:message key='error.username.invalid.characters'/>"
+								username: {
+									charactersNotAllowed: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.username.invalid.characters'/></spring:escapeBody>"
 								},
-								lastName : {
-									charactersNotAllowedName : "<fmt:message key='error.lastname.invalid.characters'/>"
+								lastName: {
+									charactersNotAllowedName: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.lastname.invalid.characters'/></spring:escapeBody>"
 								},
-								firstName : {
-									charactersNotAllowedName : "<fmt:message key='error.firstname.invalid.characters'/>"
+								firstName: {
+									charactersNotAllowedName: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.firstname.invalid.characters'/></spring:escapeBody>"
 								},
-								email : {
-									emailCheck : "<fmt:message key='error.email.invalid.format'/>"
+								email: {
+									emailCheck: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.email.invalid.format'/></spring:escapeBody>"
 								},
-								confirmEmail : {
-									equalTo : "<fmt:message key='error.emails.unequal'/>"
+								confirmEmail: {
+									equalTo: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.emails.unequal'/></spring:escapeBody>"
 								},
 								country: {
-									required: "<fmt:message key='error.country.required'/>",
-									notEqualTo: "<fmt:message key='error.country.required'/>"
+									required: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.country.required'/></spring:escapeBody>",
+									notEqualTo: "<spring:escapeBody javaScriptEscape='true'><fmt:message key='error.country.required'/></spring:escapeBody>"
 								}
 							},
 							submitHandler : function(form) {