Index: lams_central/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v
diff -u -r1.13 -r1.14
--- lams_central/web/authoring/authoring.jsp	8 Apr 2015 14:32:32 -0000	1.13
+++ lams_central/web/authoring/authoring.jsp	10 Apr 2015 16:35:09 -0000	1.14
@@ -41,220 +41,220 @@
 			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 : '<c:out value="${DEFAULT_GROUPING_TITLE_VAR}" />',
 				<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 : '<c:out value="${DEFAULT_GROUP_PREFIX_VAR}" />',
 				<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 : '<c:out value="${DEFAULT_BRANCHING_TITLE_VAR}" />',
 				<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 : '<c:out value="${DEFAULT_BRANCH_PREFIX_VAR}" />',
 				<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 : '<c:out value="${DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR}" />',
 				<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 : '<c:out value="${SUPPORT_ACTIVITY_TITLE_VAR}" />',
 				<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 : '<c:out value="${GATE_ACTIVITY_LABEL_VAR}" />',
 				<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 : '<c:out value="${BRANCHING_START_SUFFIX_VAR}" />',
 				<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 : '<c:out value="${BRANCHING_END_SUFFIX_VAR}" />',
 				<fmt:message key="authoring.fla.remove.activity.confirm" var="REMOVE_ACTIVITY_CONFIRM_VAR"/>
-				REMOVE_ACTIVITY_CONFIRM : '<c:out value="REMOVE_ACTIVITY_CONFIRM_VAR" />',
+				REMOVE_ACTIVITY_CONFIRM : '<c:out value="${REMOVE_ACTIVITY_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.branching.create.confirm" var="BRANCHING_CREATE_CONFIRM_VAR"/>
-				BRANCHING_CREATE_CONFIRM : '<c:out value="BRANCHING_CREATE_CONFIRM_VAR" />',
+				BRANCHING_CREATE_CONFIRM : '<c:out value="${BRANCHING_CREATE_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.transition.to.exists.error" var="TRANSITION_TO_EXISTS_ERROR_VAR"/>
-				TRANSITION_TO_EXISTS_ERROR : '<c:out value="TRANSITION_TO_EXISTS_ERROR_VAR" />',
+				TRANSITION_TO_EXISTS_ERROR : '<c:out value="${TRANSITION_TO_EXISTS_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.circular.sequence.error" var="CIRCULAR_SEQUENCE_ERROR_VAR"/>
-				CIRCULAR_SEQUENCE_ERROR : '<c:out value="CIRCULAR_SEQUENCE_ERROR_VAR" />',
+				CIRCULAR_SEQUENCE_ERROR : '<c:out value="${CIRCULAR_SEQUENCE_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.activity.in.container.error" var="ACTIVITY_IN_CONTAINER_ERROR_VAR"/>
-				ACTIVITY_IN_CONTAINER_ERROR : '<c:out value="ACTIVITY_IN_CONTAINER_ERROR_VAR" />',
+				ACTIVITY_IN_CONTAINER_ERROR : '<c:out value="${ACTIVITY_IN_CONTAINER_ERROR_VAR}" />',
 				
 				// 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 : '<c:out value="${DEFAULT_ANNOTATION_LABEL_TITLE_VAR}" />',
 				<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 : '<c:out value="${REGION_FIT_BUTTON_TOOLTIP_VAR}" />',
 				
 				// General
 				<fmt:message key="authoring.fla.new.folder.button" var="NEW_FOLDER_BUTTON_VAR"/>
-				NEW_FOLDER_BUTTON : '<c:out value="NEW_FOLDER_BUTTON_VAR" />',
+				NEW_FOLDER_BUTTON : '<c:out value="${NEW_FOLDER_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.copy.button" var="COPY_BUTTON_VAR"/>
-				COPY_BUTTON : '<c:out value="COPY_BUTTON_VAR" />',
+				COPY_BUTTON : '<c:out value="${COPY_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.paste.button" var="PASTE_BUTTON_VAR"/>
-				PASTE_BUTTON : '<c:out value="PASTE_BUTTON_VAR" />',
+				PASTE_BUTTON : '<c:out value="${PASTE_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.delete.button" var="DELETE_BUTTON_VAR"/>
-				DELETE_BUTTON : '<c:out value="DELETE_BUTTON_VAR" />',
+				DELETE_BUTTON : '<c:out value="${DELETE_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.rename.button" var="RENAME_BUTTON_VAR"/>
-				RENAME_BUTTON : '<c:out value="RENAME_BUTTON_VAR" />',
+				RENAME_BUTTON : '<c:out value="${RENAME_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.open.button" var="OPEN_BUTTON_VAR"/>
-				OPEN_BUTTON : '<c:out value="OPEN_BUTTON_VAR" />',
+				OPEN_BUTTON : '<c:out value="${OPEN_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.save.button" var="SAVE_BUTTON_VAR"/>
-				SAVE_BUTTON : '<c:out value="SAVE_BUTTON_VAR" />',
+				SAVE_BUTTON : '<c:out value="${SAVE_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.import.button" var="IMPORT_BUTTON_VAR"/>
-				IMPORT_BUTTON : '<c:out value="IMPORT_BUTTON_VAR" />',
+				IMPORT_BUTTON : '<c:out value="${IMPORT_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.folder" var="FOLDER_VAR"/>
-				FOLDER : '<c:out value="FOLDER_VAR" />',
+				FOLDER : '<c:out value="${FOLDER_VAR}" />',
 				<fmt:message key="authoring.fla.sequence" var="SEQUENCE_VAR"/>
-				SEQUENCE : '<c:out value="SEQUENCE_VAR" />',
+				SEQUENCE : '<c:out value="${SEQUENCE_VAR}" />',
 				<fmt:message key="authoring.fla.sequence.not.valid" var="SEQUENCE_NOT_VALID_VAR"/>
-				SEQUENCE_NOT_VALID : '<c:out value="SEQUENCE_NOT_VALID_VAR" />',
+				SEQUENCE_NOT_VALID : '<c:out value="${SEQUENCE_NOT_VALID_VAR}" />',
 				<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 : '<c:out value="${SEQUENCE_VALIDATION_ISSUES_VAR}" />',
 				<fmt:message key="authoring.fla.save.successful" var="SAVE_SUCCESSFUL_VAR"/>
-				SAVE_SUCCESSFUL : '<c:out value="SAVE_SUCCESSFUL_VAR" />',
+				SAVE_SUCCESSFUL : '<c:out value="${SAVE_SUCCESSFUL_VAR}" />',
 				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
-				NAVIGATE_AWAY_CONFIRM : '<c:out value="NAVIGATE_AWAY_CONFIRM_VAR" />',
+				NAVIGATE_AWAY_CONFIRM : '<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.delete.node.confirm" var="DELETE_NODE_CONFIRM_VAR"/>
-				DELETE_NODE_CONFIRM : '<c:out value="DELETE_NODE_CONFIRM_VAR" />',
+				DELETE_NODE_CONFIRM : '<c:out value="${DELETE_NODE_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.sequence.overwrite.confirm" var="SEQUENCE_OVERWRITE_CONFIRM_VAR"/>
-				SEQUENCE_OVERWRITE_CONFIRM : '<c:out value="SEQUENCE_OVERWRITE_CONFIRM_VAR" />',
+				SEQUENCE_OVERWRITE_CONFIRM : '<c:out value="${SEQUENCE_OVERWRITE_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.new.folder.title.prompt" var="NEW_FOLDER_TITLE_PROMPT_VAR"/>
-				NEW_FOLDER_TITLE_PROMPT : '<c:out value="NEW_FOLDER_TITLE_PROMPT_VAR" />',
+				NEW_FOLDER_TITLE_PROMPT : '<c:out value="${NEW_FOLDER_TITLE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.rename.title.prompt" var="RENAME_TITLE_PROMPT_VAR"/>
-				RENAME_TITLE_PROMPT : '<c:out value="RENAME_TITLE_PROMPT_VAR" />',
+				RENAME_TITLE_PROMPT : '<c:out value="${RENAME_TITLE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.save.sequence.title.prompt" var="SAVE_SEQUENCE_TITLE_PROMPT_VAR"/>
-				SAVE_SEQUENCE_TITLE_PROMPT : '<c:out value="SAVE_SEQUENCE_TITLE_PROMPT_VAR" />',
+				SAVE_SEQUENCE_TITLE_PROMPT : '<c:out value="${SAVE_SEQUENCE_TITLE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.import.part.choose.prompt" var="IMPORT_PART_CHOOSE_PROMPT_VAR"/>
-				IMPORT_PART_CHOOSE_PROMPT : '<c:out value="IMPORT_PART_CHOOSE_PROMPT_VAR" />',
+				IMPORT_PART_CHOOSE_PROMPT : '<c:out value="${IMPORT_PART_CHOOSE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.folder.not.selected.error" var="FOLDER_NOT_SELECTED_ERROR_VAR"/>
-				FOLDER_NOT_SELECTED_ERROR : '<c:out value="FOLDER_NOT_SELECTED_ERROR_VAR" />',
+				FOLDER_NOT_SELECTED_ERROR : '<c:out value="${FOLDER_NOT_SELECTED_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.title.validation.error" var="TITLE_VALIDATION_ERROR_VAR"/>
-				TITLE_VALIDATION_ERROR : '<c:out value="TITLE_VALIDATION_ERROR_VAR" />',
+				TITLE_VALIDATION_ERROR : '<c:out value="${TITLE_VALIDATION_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.folder.exists.error" var="FOLDER_EXISTS_ERROR_VAR"/>
-				FOLDER_EXISTS_ERROR : '<c:out value="FOLDER_EXISTS_ERROR_VAR" />',
+				FOLDER_EXISTS_ERROR : '<c:out value="${FOLDER_EXISTS_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.sequence.exists.error" var="SEQUENCE_EXISTS_ERROR_VAR"/>
-				SEQUENCE_EXISTS_ERROR : '<c:out value="SEQUENCE_EXISTS_ERROR_VAR" />',
+				SEQUENCE_EXISTS_ERROR : '<c:out value="${SEQUENCE_EXISTS_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.sequence.save.error" var="SEQUENCE_SAVE_ERROR_VAR"/>
-				SEQUENCE_SAVE_ERROR : '<c:out value="SEQUENCE_SAVE_ERROR_VAR" />',
+				SEQUENCE_SAVE_ERROR : '<c:out value="${SEQUENCE_SAVE_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.sequence.not.selected.error" var="SEQUENCE_NOT_SELECTED_ERROR_VAR"/>
-				SEQUENCE_NOT_SELECTED_ERROR : '<c:out value="SEQUENCE_NOT_SELECTED_ERROR_VAR" />',
+				SEQUENCE_NOT_SELECTED_ERROR : '<c:out value="${SEQUENCE_NOT_SELECTED_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.sequence.load.error" var="SEQUENCE_LOAD_ERROR_VAR"/>
-				SEQUENCE_LOAD_ERROR : '<c:out value="SEQUENCE_LOAD_ERROR_VAR" />',
+				SEQUENCE_LOAD_ERROR : '<c:out value="${SEQUENCE_LOAD_ERROR_VAR}" />',
 				
 				// HandlerLib
 				<fmt:message key="authoring.fla.transition.from.exists.error" var="TRANSITION_FROM_EXISTS_ERROR_VAR"/>
-				TRANSITION_FROM_EXISTS_ERROR : '<c:out value="TRANSITION_FROM_EXISTS_ERROR_VAR" />',
+				TRANSITION_FROM_EXISTS_ERROR : '<c:out value="${TRANSITION_FROM_EXISTS_ERROR_VAR}" />',
 				
 				// MenuLib
 				<fmt:message key="authoring.fla.export.image.dialog.title" var="EXPORT_IMAGE_DIALOG_TITLE_VAR"/>
-				EXPORT_IMAGE_DIALOG_TITLE : '<c:out value="EXPORT_IMAGE_DIALOG_TITLE_VAR" />',
+				EXPORT_IMAGE_DIALOG_TITLE : '<c:out value="${EXPORT_IMAGE_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${EXPORT_SEQUENCE_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${ACTIVITY_COPY_TITLE_PREFIX_VAR}" />',
 				<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 : '<c:out value="${PREVIEW_LESSON_DEFAULT_TITLE_VAR}" />',
 				<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 : '<c:out value="${SAVE_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${OPEN_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${IMPORT_PART_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${RUN_SEQUENCES_FOLDER_VAR}" />',
 				<fmt:message key="authoring.fla.arrange.confirm" var="ARRANGE_CONFIRM_VAR"/>
-				ARRANGE_CONFIRM : '<c:out value="ARRANGE_CONFIRM_VAR" />',
+				ARRANGE_CONFIRM : '<c:out value="${ARRANGE_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.clear.canvas.confirm" var="CLEAR_CANVAS_CONFIRM_VAR"/>
-				CLEAR_CANVAS_CONFIRM : '<c:out value="CLEAR_CANVAS_CONFIRM_VAR" />',
+				CLEAR_CANVAS_CONFIRM : '<c:out value="${CLEAR_CANVAS_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.branching.start.place.prompt" var="BRANCHING_START_PLACE_PROMPT_VAR"/>
-				BRANCHING_START_PLACE_PROMPT : '<c:out value="BRANCHING_START_PLACE_PROMPT_VAR" />',
+				BRANCHING_START_PLACE_PROMPT : '<c:out value="${BRANCHING_START_PLACE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.branching.end.place.prompt" var="BRANCHING_END_PLACE_PROMPT_VAR"/>
-				BRANCHING_END_PLACE_PROMPT : '<c:out value="BRANCHING_END_PLACE_PROMPT_VAR" />',
+				BRANCHING_END_PLACE_PROMPT : '<c:out value="${BRANCHING_END_PLACE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.annotation.region.place.prompt" var="ANNOTATION_REGION_PLACE_PROMPT_VAR"/>
-				ANNOTATION_REGION_PLACE_PROMPT : '<c:out value="ANNOTATION_REGION_PLACE_PROMPT_VAR" />',
+				ANNOTATION_REGION_PLACE_PROMPT : '<c:out value="${ANNOTATION_REGION_PLACE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.annotation.label.place.prompt" var="ANNOTATION_LABEL_PLACE_PROMPT_VAR"/>
-				ANNOTATION_LABEL_PLACE_PROMPT : '<c:out value="ANNOTATION_LABEL_PLACE_PROMPT_VAR" />',
+				ANNOTATION_LABEL_PLACE_PROMPT : '<c:out value="${ANNOTATION_LABEL_PLACE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.optional.activity.place.prompt" var="OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR"/>
-				OPTIONAL_ACTIVITY_PLACE_PROMPT : '<c:out value="OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR" />',
+				OPTIONAL_ACTIVITY_PLACE_PROMPT : '<c:out value="${OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.support.activity.place.prompt" var="SUPPORT_ACTIVITY_PLACE_PROMPT_VAR"/>
-				SUPPORT_ACTIVITY_PLACE_PROMPT : '<c:out value="SUPPORT_ACTIVITY_PLACE_PROMPT_VAR" />',
+				SUPPORT_ACTIVITY_PLACE_PROMPT : '<c:out value="${SUPPORT_ACTIVITY_PLACE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.transition.place.prompt" var="TRANSITION_PLACE_PROMPT_VAR"/>
-				TRANSITION_PLACE_PROMPT : '<c:out value="TRANSITION_PLACE_PROMPT_VAR" />',
+				TRANSITION_PLACE_PROMPT : '<c:out value="${TRANSITION_PLACE_PROMPT_VAR}" />',
 				<fmt:message key="authoring.fla.paste.error" var="PASTE_ERROR_VAR"/>
-				PASTE_ERROR : '<c:out value="PASTE_ERROR_VAR" />',
+				PASTE_ERROR : '<c:out value="${PASTE_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.preview.error" var="PREVIEW_ERROR_VAR"/>
-				PREVIEW_ERROR : '<c:out value="PREVIEW_ERROR_VAR" />',
+				PREVIEW_ERROR : '<c:out value="${PREVIEW_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.cross.branching.error" var="CROSS_BRANCHING_ERROR_VAR"/>
-				CROSS_BRANCHING_ERROR : '<c:out value="CROSS_BRANCHING_ERROR_VAR" />',
+				CROSS_BRANCHING_ERROR : '<c:out value="${CROSS_BRANCHING_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.end.match.error" var="END_MATCH_ERROR_VAR"/>
-				END_MATCH_ERROR : '<c:out value="END_MATCH_ERROR_VAR" />',
+				END_MATCH_ERROR : '<c:out value="${END_MATCH_ERROR_VAR}" />',
 				
 				
 				// PropertyLib
 				<fmt:message key="authoring.fla.ok.button" var="OK_BUTTON_VAR"/>
-				OK_BUTTON : '<c:out value="OK_BUTTON_VAR" />',
+				OK_BUTTON : '<c:out value="${OK_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.cancel.button" var="CANCEL_BUTTON_VAR"/>
-				CANCEL_BUTTON : '<c:out value="CANCEL_BUTTON_VAR" />',
+				CANCEL_BUTTON : '<c:out value="${CANCEL_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.clear.all.button" var="CLEAR_ALL_BUTTON_VAR"/>
-				CLEAR_ALL_BUTTON : '<c:out value="CLEAR_ALL_BUTTON_VAR" />',
+				CLEAR_ALL_BUTTON : '<c:out value="${CLEAR_ALL_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.refresh.button" var="REFRESH_BUTTON_VAR"/>
-				REFRESH_BUTTON : '<c:out value="REFRESH_BUTTON_VAR" />',
+				REFRESH_BUTTON : '<c:out value="${REFRESH_BUTTON_VAR}" />',
 				<fmt:message key="authoring.fla.remove.condition.button" var="REMOVE_CONDITION_BUTTON_VAR"/>
-				REMOVE_CONDITION_BUTTON : '<c:out value="REMOVE_CONDITION_BUTTON_VAR" />',
+				REMOVE_CONDITION_BUTTON : '<c:out value="${REMOVE_CONDITION_BUTTON_VAR}" />',
 				<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 : '<c:out value="${PROPERTIES_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${GROUP_NAMING_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_GROUPS_HEADER_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_GROUP_HEADER_VAR}" />',
 				<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 : '<c:out value="${CONDITIONS_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_CONDITIONS_HEADER_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_CONDITION_HEADER_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_GATE_HEADER_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_BRANCHES_HEADER_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_BRANCH_HEADER_VAR}" />',
 				<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 : '<c:out value="${GATE_STATE_MAPPING_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_DIALOG_TITLE_VAR}" />',
 				<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 : '<c:out value="${GATE_STATE_OPEN_VAR}" />',
 				<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 : '<c:out value="${GATE_STATE_CLOSED_VAR}" />',
 				<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 : '<c:out value="${BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX_VAR}" />',
 				<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 : '<c:out value="${COMPLEX_OUTPUT_SUFFIX_VAR}" />',
 				<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 : '<c:out value="${RANGE_OUTPUT_SUFFIX_VAR}" />',
 				<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 : '<c:out value="${RANGE_CONDITION_DESCRIPTION_VAR}" />',
 				<fmt:message key="authoring.fla.exact.condition.description" var="EXACT_CONDITION_DESCRIPTION_VAR"/>
-				EXACT_CONDITION_DESCRIPTION : '<c:out value="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" />',
+				LESS_CONDITION_DESCRIPTION : '<c:out value="${LESS_CONDITION_DESCRIPTION_VAR}" />',
 				<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 : '<c:out value="${GREATER_CONDITION_DESCRIPTION_VAR}" />',
 				<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 : '<c:out value="${DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR}" />',
 				<fmt:message key="authoring.fla.clear.all.confirm" var="CLEAR_ALL_CONFIRM_VAR"/>
-				CLEAR_ALL_CONFIRM : '<c:out value="CLEAR_ALL_CONFIRM_VAR" />',
+				CLEAR_ALL_CONFIRM : '<c:out value="${CLEAR_ALL_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.remove.condition.confirm" var="REMOVE_CONDITION_CONFIRM_VAR"/>
-				REMOVE_CONDITION_CONFIRM : '<c:out value="REMOVE_CONDITION_CONFIRM_VAR" />',
+				REMOVE_CONDITION_CONFIRM : '<c:out value="${REMOVE_CONDITION_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.refresh.conditions.confirm" var="REFRESH_CONDITIONS_CONFIRM_VAR"/>
-				REFRESH_CONDITIONS_CONFIRM : '<c:out value="REFRESH_CONDITIONS_CONFIRM_VAR" />',
+				REFRESH_CONDITIONS_CONFIRM : '<c:out value="${REFRESH_CONDITIONS_CONFIRM_VAR}" />',
 				<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 : '<c:out value="CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR" />',
+				CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM : '<c:out value="${CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.conditions.to.default.branch.confirm" var="CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
-				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR" />',
+				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="${CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.groups.to.default.branch.confirm" var="GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
-				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR" />',
+				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="${GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR}" />',
 				<fmt:message key="authoring.fla.range.condition.add.start.error" var="RANGE_CONDITION_ADD_START_ERROR_VAR"/>
-				RANGE_CONDITION_ADD_START_ERROR : '<c:out value="RANGE_CONDITION_ADD_START_ERROR_VAR" />',
+				RANGE_CONDITION_ADD_START_ERROR : '<c:out value="${RANGE_CONDITION_ADD_START_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.range.condition.add.end.error" var="RANGE_CONDITION_ADD_END_ERROR_VAR"/>
-				RANGE_CONDITION_ADD_END_ERROR : '<c:out value="RANGE_CONDITION_ADD_END_ERROR_VAR" />',
+				RANGE_CONDITION_ADD_END_ERROR : '<c:out value="${RANGE_CONDITION_ADD_END_ERROR_VAR}" />',
 				<fmt:message key="authoring.fla.group.title.validation.erorr" var="GROUP_TITLE_VALIDATION_ERORR_VAR"/>
-				GROUP_TITLE_VALIDATION_ERORR : '<c:out value="GROUP_TITLE_VALIDATION_ERORR_VAR" />'
+				GROUP_TITLE_VALIDATION_ERORR : '<c:out value="${GROUP_TITLE_VALIDATION_ERORR_VAR}" />'
 			},
 			
 			isReadOnlyMode = false,