Index: lams_tool_assessment/web/includes/javascript/assessmentoption.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/includes/javascript/assessmentoption.js,v
diff -u -r1.11.2.2 -r1.11.2.3
--- lams_tool_assessment/web/includes/javascript/assessmentoption.js	20 Aug 2016 04:11:57 -0000	1.11.2.2
+++ lams_tool_assessment/web/includes/javascript/assessmentoption.js	22 Sep 2016 02:27:16 -0000	1.11.2.3
@@ -79,7 +79,7 @@
 	//in order to be able to use option's value, copy it from CKEditor to textarea
 	function prepareOptionEditorsForAjaxSubmit(){
 		if ((questionType == 1) || (questionType == 7) || (questionType == 8)) {
-			$("textarea[name^=optionString]").each(function() {
+			$("textarea[name^=optionString], textarea[name^=optionFeedback]").each(function()  {
 				prepareOptionEditorForAjaxSubmit(this);
 			});
 			
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	1 Jun 2016 14:05:16 -0000	1.1.2.3
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	22 Sep 2016 02:26:45 -0000	1.1.2.4
@@ -28,6 +28,6 @@
     	<fmt:message key="label.authoring.basic.option.feedback"/>
     </label>
     
-    <lams:STRUTS-textarea property="optionFeedback${status.index}" rows="3" value="${option.feedback}" styleClass="form-control"/>
+     <lams:CKEditor id="optionFeedback${status.index}" value="${option.feedback}" contentFolderID="${contentFolderID}" />
 </div>