Index: lams_common/src/java/org/lamsfoundation/lams/questions/Question.java
===================================================================
diff -u -rf26fb3937b73bfdefd25a6166863ea188d5f8cb9 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(.../Question.java)	(revision f26fb3937b73bfdefd25a6166863ea188d5f8cb9)
+++ lams_common/src/java/org/lamsfoundation/lams/questions/Question.java	(.../Question.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -41,10 +41,11 @@
     public static final String QUESTION_TYPE_ESSAY = "es";
     public static final String QUESTION_TYPE_MATCHING = "mt";
     public static final String QUESTION_TYPE_FILL_IN_BLANK = "fb";
+    public static final String QUESTION_TYPE_MARK_HEDGING = "mh";
     public static final Set<String> QUESTION_TYPES = new TreeSet<String>(Arrays.asList(new String[] {
 	    Question.QUESTION_TYPE_MULTIPLE_CHOICE, Question.QUESTION_TYPE_MULTIPLE_RESPONSE,
 	    Question.QUESTION_TYPE_TRUE_FALSE, Question.QUESTION_TYPE_ESSAY, Question.QUESTION_TYPE_MATCHING,
-	    Question.QUESTION_TYPE_FILL_IN_BLANK }));
+	    Question.QUESTION_TYPE_FILL_IN_BLANK, Question.QUESTION_TYPE_MARK_HEDGING }));
 
     private String type;
     private String title;
Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r495a38a55b249f3b65031de0ac76ecbd9b86ce09 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 495a38a55b249f3b65031de0ac76ecbd9b86ce09)
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -50,6 +50,7 @@
 			<forward name="truefalse" path="/pages/authoring/parts/addtruefalse.jsp" />
 			<forward name="essay" path="/pages/authoring/parts/addessay.jsp" />
 			<forward name="ordering" path="/pages/authoring/parts/addordering.jsp" />
+			<forward name="markhedging" path="/pages/authoring/parts/addmarkhedging.jsp" />
 		</action>
 		<action path="/authoring/editQuestion"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
@@ -63,7 +64,8 @@
 			<forward name="numerical" path="/pages/authoring/parts/addnumerical.jsp" />
 			<forward name="truefalse" path="/pages/authoring/parts/addtruefalse.jsp" />
 			<forward name="essay" path="/pages/authoring/parts/addessay.jsp" />	
-			<forward name="ordering" path="/pages/authoring/parts/addordering.jsp" />			
+			<forward name="ordering" path="/pages/authoring/parts/addordering.jsp" />
+			<forward name="markhedging" path="/pages/authoring/parts/addmarkhedging.jsp" />			
 		</action>
 		<action path="/authoring/saveOrUpdateQuestion"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.AuthoringAction"
@@ -200,6 +202,11 @@
 			parameter="submitAll" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
 		</action>
+		<action path="/learning/submitSingleMarkHedgingQuestion"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.LearningAction"
+			parameter="submitSingleMarkHedgingQuestion" >
+			<forward name="success" path="/pages/learning/parts/markhedging.jsp" />
+		</action>
 		<action path="/learning/checkLeaderProgress"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.LearningAction"
 			parameter="checkLeaderProgress" >
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -55,6 +55,8 @@
     public static final short QUESTION_TYPE_ESSAY = 6;
     
     public static final short QUESTION_TYPE_ORDERING = 7;
+    
+    public static final short QUESTION_TYPE_MARK_HEDGING = 8;
 
     // for action forward name
     public static final String SUCCESS = "success";
@@ -113,6 +115,8 @@
     
     public static final String ATTR_OPTION_GRADE_PREFIX = "optionGrade";
     
+    public static final String ATTR_OPTION_CORRECT = "optionCorrect";
+    
     public static final String ATTR_OPTION_FLOAT_PREFIX = "optionFloat";
     
     public static final String ATTR_OPTION_ACCEPTED_ERROR_PREFIX = "optionAcceptedError";
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150629.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150629.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150629.sql	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3489 New question type for marks hedging
+ALTER TABLE tl_laasse10_question_option ADD COLUMN correct TINYINT(1) NOT NULL DEFAULT 0;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
===================================================================
diff -u -r1668e000b0959071785e5cdd21732af39bd1505f -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -108,6 +108,8 @@
     
     private String titleEscaped;
     
+    private boolean responseSubmitted;
+    
     /**
      * Grade acquired from QUestionReference in learner.
      */
@@ -608,4 +610,11 @@
     public void setQuestionResults(List<Object[]> questionResults2) {
 	this.questionResults = questionResults2;
     }
+    
+    public boolean isResponseSubmitted() {
+	return responseSubmitted;
+    }
+    public void setResponseSubmitted(boolean responseSubmitted) {
+	this.responseSubmitted = responseSubmitted;
+    }
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
===================================================================
diff -u -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java	(.../AssessmentQuestionOption.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java	(.../AssessmentQuestionOption.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -49,6 +49,8 @@
     
     private float grade;
     
+    private boolean correct;
+    
     private String feedback;
     
     // *************** NON Persist Fields ********************    
@@ -171,6 +173,18 @@
     }
     
     /**
+     * @hibernate.property column="correct"
+     * @return
+     */
+    public boolean isCorrect() {
+	return correct;
+    }
+
+    public void setCorrect(boolean correct) {
+	this.correct = correct;
+    }
+    
+    /**
      * @hibernate.property column="feedback" type="text"
      * 
      * @return Returns feedback on this answer option.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
===================================================================
diff -u -r2a68a250e3ae88b708a9a2a91e9f3439a4b6d7a9 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 2a68a250e3ae88b708a9a2a91e9f3439a4b6d7a9)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -53,9 +53,9 @@
     private Float maxMark;
     private float penalty;
     private Set<AssessmentOptionAnswer> optionAnswers;
+    private Date finishDate;
     
     // DTO fields:
-    private Date finishDate;
     private AssessmentUser user;
     private String answerStringEscaped;
     
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rdacc22919fbce0447cf7850bdfb602d446354050 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision dacc22919fbce0447cf7850bdfb602d446354050)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -63,6 +63,7 @@
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.rest.RestTags;
 import org.lamsfoundation.lams.rest.ToolRestManager;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
@@ -431,6 +432,11 @@
 	for (LinkedHashSet<AssessmentQuestion> questionsForOnePage : pagedQuestions) {
 	    for (AssessmentQuestion question : questionsForOnePage) {
 		
+		//in case single MarkHedging question needs to be stored -- search for that question
+		if ((singleMarkHedgingQuestionUid != null) && !question.getUid().equals(singleMarkHedgingQuestionUid)) {
+		    continue;
+		}
+		
 		// In case if assessment was updated after result has been started check question still exists in DB as
 		// it could be deleted if modified in monitor.
 		if ((assessment.getUpdated() != null) && assessment.getUpdated().after(result.getStartDate())) {
@@ -465,8 +471,9 @@
 	    }
 	}
 	
-	//store grades and finished date only on user hitting submit all answers button 
-	if (!isAutosave) {
+	//store grades and finished date only on user hitting submit all answers button (and not submit mark hedging question)
+	boolean isStoreResult = !isAutosave && singleMarkHedgingQuestionUid == null;
+	if (isStoreResult) {
 	    result.setMaximumGrade(maximumGrade);
 	    result.setGrade(grade);
 	    result.setFinishDate(new Timestamp(new Date().getTime()));
@@ -512,7 +519,6 @@
 	questionAnswer.setAnswerBoolean(question.getAnswerBoolean());
 	questionAnswer.setAnswerFloat(question.getAnswerFloat());
 	questionAnswer.setAnswerString(question.getAnswerString());
-	questionAnswer.setFinishDate(new Date());
 
 	int j = 0;
 	for (AssessmentQuestionOption option : question.getOptions()) {
@@ -541,13 +547,15 @@
 		    mark += option.getGrade() * maxMark;
 		}
 	    }
+	    
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
 	    float maxMarkForCorrectAnswer = maxMark / question.getOptions().size();
 	    for (AssessmentQuestionOption option : question.getOptions()) {
 		if (option.getAnswerInt() == option.getUid()) {
 		    mark += maxMarkForCorrectAnswer;
 		}
 	    }
+	    
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER) {
 	    for (AssessmentQuestionOption option : question.getOptions()) {
 		String optionString = option.getOptionString().trim().replaceAll("\\*", ".*");
@@ -567,6 +575,7 @@
 		    break;
 		}
 	    }
+	    
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
 	    String answerString = question.getAnswerString();
 	    if (answerString != null) {
@@ -608,10 +617,12 @@
 		    }
 		}
 	    }
+	    
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_TRUE_FALSE) {
 	    if (question.getAnswerBoolean() == question.getCorrectAnswer() && question.getAnswerString() != null) {
 		mark = maxMark;
 	    }
+	    
 	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 	    float maxMarkForCorrectAnswer = maxMark / question.getOptions().size();
 	    TreeSet<AssessmentQuestionOption> correctOptionSet = new TreeSet<AssessmentQuestionOption>(
@@ -625,10 +636,20 @@
 		    mark += maxMarkForCorrectAnswer;
 		}
 	    }
+	    
+	} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
+	    for (AssessmentQuestionOption option : question.getOptions()) {
+		if (option.isCorrect()) {
+		    mark += option.getAnswerInt();
+		    break;
+		}
+	    }
 	}
 	
 	//we start calculating and storing marks only in case it's not an autosave request
 	if (!isAutosave) {
+	    
+	    questionAnswer.setFinishDate(new Date());
 
 	    if (mark > maxMark) {
 		mark = maxMark;
@@ -662,6 +683,8 @@
 	    
 	    questionAnswer.setMark(mark);
 	    questionAnswer.setMaxMark(maxMark);
+	    //for displaying purposes in case of submitSingleMarkHedgingQuestion() Ajax call
+	    question.setMark(mark);
 	}
 	
 	return mark;
@@ -869,7 +892,10 @@
 	    for (AssessmentResult result : results) {
 		for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
 		    if (question.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
+			
+			//for displaying purposes, no saving occurrs
 			questionResult.setFinishDate(result.getFinishDate());
+			
 			questionResultsForSummary.add(questionResult);
 			break;
 		    }
@@ -1965,7 +1991,8 @@
 
 	    if (type == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS
 		    || type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE
-		    || type == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
+		    || type == AssessmentConstants.QUESTION_TYPE_NUMERICAL
+		    || type == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
 
 		if (!questionJSONData.has(RestTags.ANSWERS))
 		    throw new JSONException("REST Authoring is missing answers for a question of type " + type
@@ -1978,6 +2005,7 @@
 		    AssessmentQuestionOption option = new AssessmentQuestionOption();
 		    option.setSequenceId(answerData.getInt(RestTags.DISPLAY_ORDER));
 		    option.setGrade(Float.parseFloat(answerData.getString("grade")));
+		    option.setCorrect(Boolean.parseBoolean(JsonUtil.opt(answerData, "correct", "false")));
 		    option.setAcceptedError(Float.parseFloat(JsonUtil.opt(answerData, "acceptedError", "0.0")));
 		    option.setFeedback(JsonUtil.opt(answerData, "feedback", (String) null));
 		    option.setOptionString(JsonUtil.opt(answerData, RestTags.ANSWER_TEXT, (String) null));
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -ra4a61e7b65ede7f903eb08521a9455685ef9283d -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a4a61e7b65ede7f903eb08521a9455685ef9283d)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -595,14 +595,20 @@
 
 	    // options are different depending on the type
 	    if (Question.QUESTION_TYPE_MULTIPLE_CHOICE.equals(question.getType())
-		    || Question.QUESTION_TYPE_FILL_IN_BLANK.equals(question.getType())) {
+		    || Question.QUESTION_TYPE_FILL_IN_BLANK.equals(question.getType())
+		    || Question.QUESTION_TYPE_MARK_HEDGING.equals(question.getType())) {
 		boolean isMultipleChoice = Question.QUESTION_TYPE_MULTIPLE_CHOICE.equals(question.getType());
+		boolean isMarkHedgingType = Question.QUESTION_TYPE_MARK_HEDGING.equals(question.getType());
 		
 		// setting answers is very similar in both types, so they were put together here
-		if (isMultipleChoice) {
+		if (isMarkHedgingType) {
+		    assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_MARK_HEDGING);
+		    
+		} else if (isMultipleChoice) {
 		    assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE);
 		    assessmentQuestion.setMultipleAnswersAllowed(false);
 		    assessmentQuestion.setShuffle(false);
+		    
 		} else {
 		    assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER);
 		    assessmentQuestion.setCaseSensitive(false);
@@ -628,7 +634,7 @@
 
 			if ((answer.getScore() != null) && (answer.getScore() > 0)) {
 			    // for fill in blanks question all answers are correct and get full grade
-			    if (!isMultipleChoice || correctAnswer == null) {
+			    if (!isMultipleChoice && !isMarkHedgingType || correctAnswer == null) {
 				// whatever the correct answer holds, it becomes the question score
 				questionGrade = new Double(Math.ceil(answer.getScore())).intValue();
 				// 100% goes to the correct answer
@@ -756,6 +762,59 @@
 	    } else if (Question.QUESTION_TYPE_ESSAY.equals(question.getType())) {
 		assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_ESSAY);
 		assessmentQuestion.setAllowRichEditor(false);
+		
+	    } else if (Question.QUESTION_TYPE_ESSAY.equals(question.getType())) {
+		assessmentQuestion.setType(AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE);
+		assessmentQuestion.setShuffle(false);
+
+		String correctAnswer = null;
+		if (question.getAnswers() != null) {
+		    TreeSet<AssessmentQuestionOption> optionList = new TreeSet<AssessmentQuestionOption>(
+			    new SequencableComparator());
+		    int orderId = 1;
+		    for (Answer answer : question.getAnswers()) {
+			String answerText = QuestionParser.processHTMLField(answer.getText(), false, contentFolderID,
+				question.getResourcesFolderPath());
+			if ((correctAnswer != null) && correctAnswer.equals(answerText)) {
+			    AuthoringAction.log.warn("Skipping an answer with same text as the correct answer: "
+				    + answerText);
+			    continue;
+			}
+			AssessmentQuestionOption assessmentAnswer = new AssessmentQuestionOption();
+			assessmentAnswer.setOptionString(answerText);
+			assessmentAnswer.setSequenceId(orderId++);
+			assessmentAnswer.setFeedback(answer.getFeedback());
+
+			if ((answer.getScore() != null) && (answer.getScore() > 0)) {
+			    // for fill in blanks question all answers are correct and get full grade
+			    if (correctAnswer == null) {
+				// whatever the correct answer holds, it becomes the question score
+				questionGrade = new Double(Math.ceil(answer.getScore())).intValue();
+				// 100% goes to the correct answer
+				assessmentAnswer.setGrade(1);
+				correctAnswer = answerText;
+			    } else {
+				AuthoringAction.log
+					.warn("Choosing only first correct answer, despite another one was found: "
+						+ answerText);
+				assessmentAnswer.setGrade(0);
+			    }
+			} else {
+			    assessmentAnswer.setGrade(0);
+			}
+
+			optionList.add(assessmentAnswer);
+		    }
+
+		    assessmentQuestion.setOptions(optionList);
+		}
+
+		if (correctAnswer == null) {
+		    AuthoringAction.log.warn("No correct answer found for question: " + question.getText());
+		    continue;
+		}
+
+		
 	    } else {
 		AuthoringAction.log.warn("Unknow QTI question type: " + question.getType());
 		continue;
@@ -907,7 +966,25 @@
 		question.setType(Question.QUESTION_TYPE_ESSAY);
 		answers = null;
 		break;
+		
+	    case AssessmentConstants.QUESTION_TYPE_MARK_HEDGING:
 
+		question.setType(Question.QUESTION_TYPE_MARK_HEDGING);
+
+		for (AssessmentQuestionOption assessmentAnswer : assessmentQuestion.getOptions()) {
+		    Answer answer = new Answer();
+		    boolean isCorrectAnswer = assessmentAnswer.isCorrect();
+
+		    answer.setText(assessmentAnswer.getOptionString());
+		    answer.setScore(isCorrectAnswer ? new Integer(assessmentQuestion.getDefaultGrade()).floatValue()
+			    : 0);
+		    answer.setFeedback(isCorrectAnswer ? assessmentQuestion.getFeedbackOnCorrect() : assessmentQuestion
+			    .getFeedbackOnIncorrect());
+
+		    answers.add(assessmentAnswer.getSequenceId(), answer);
+		}
+		break;
+
 	    default:
 		continue;
 	    }
@@ -1643,6 +1720,9 @@
 	case AssessmentConstants.QUESTION_TYPE_ORDERING:
 	    forward = mapping.findForward("ordering");
 	    break;
+	case AssessmentConstants.QUESTION_TYPE_MARK_HEDGING:
+	    forward = mapping.findForward("markhedging");
+	    break;	    
 	default:
 	    forward = null;
 	    break;
@@ -1686,7 +1766,8 @@
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS)
 		|| (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)
-		|| (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL)) {
+		|| (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL)
+		|| (questionType == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING)) {
 	    Set<AssessmentQuestionOption> optionList = question.getOptions();
 	    request.setAttribute(AssessmentConstants.ATTR_OPTION_LIST, optionList);
 	}
@@ -1768,14 +1849,20 @@
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
 	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
+	} else if (type == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
+	    question.setShuffle(questionForm.isShuffle());
+	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
+	    question.setFeedbackOnPartiallyCorrect(questionForm.getFeedbackOnPartiallyCorrect());
+	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	}
 
 	// set options
 	if ((type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE)
 		|| (type == AssessmentConstants.QUESTION_TYPE_ORDERING)
 		|| (type == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS)
 		|| (type == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)
-		|| (type == AssessmentConstants.QUESTION_TYPE_NUMERICAL)) {
+		|| (type == AssessmentConstants.QUESTION_TYPE_NUMERICAL)
+		|| (type == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING)) {
 	    Set<AssessmentQuestionOption> optionList = getOptionsFromRequest(request, true);
 	    Set<AssessmentQuestionOption> options = new LinkedHashSet<AssessmentQuestionOption>();
 	    int seqId = 0;
@@ -1854,6 +1941,8 @@
 
 	int count = NumberUtils.toInt(paramMap.get(AssessmentConstants.ATTR_OPTION_COUNT));
 	int questionType = WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_TYPE);
+	Integer correctOptionIndex = (paramMap.get(AssessmentConstants.ATTR_OPTION_CORRECT) == null) ? null
+		: NumberUtils.toInt(paramMap.get(AssessmentConstants.ATTR_OPTION_CORRECT));
 	TreeSet<AssessmentQuestionOption> optionList = new TreeSet<AssessmentQuestionOption>(
 		new SequencableComparator());
 	for (int i = 0; i < count; i++) {
@@ -1924,6 +2013,21 @@
 		option.setOptionString(optionString);
 		option.setAnswerInt(i);
 		optionList.add(option);
+	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
+		String optionString = paramMap.get(AssessmentConstants.ATTR_OPTION_STRING_PREFIX + i);
+		if ((optionString == null) && isForSaving) {
+		    continue;
+		}
+
+		AssessmentQuestionOption option = new AssessmentQuestionOption();
+		String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i);
+		option.setSequenceId(NumberUtils.toInt(sequenceId));
+		option.setOptionString(optionString);
+		if ((correctOptionIndex != null) && correctOptionIndex.equals(new Integer(sequenceId))) {
+		    option.setCorrect(true);
+		}
+		option.setFeedback(paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i));
+		optionList.add(option);
 	    }
 	}
 	return optionList;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -rdacc22919fbce0447cf7850bdfb602d446354050 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision dacc22919fbce0447cf7850bdfb602d446354050)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -102,6 +102,9 @@
 	if (param.equals("nextPage")) {
 	    return nextPage(mapping, form, request, response);
 	}
+	if (param.equals("submitSingleMarkHedgingQuestion")) {
+	    return submitSingleMarkHedgingQuestion(mapping, form, request, response);
+	}
 	if (param.equals("submitAll")) {
 	    return submitAll(mapping, form, request, response);
 	}
@@ -423,6 +426,58 @@
     }
     
     /**
+     * Handling submittion of MarkHedging type of Questions (in case of leader aware tool).
+     */
+    private ActionForward submitSingleMarkHedgingQuestion(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+	String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(sessionMapID);
+	ArrayList<LinkedHashSet<AssessmentQuestion>> pagedQuestions = (ArrayList<LinkedHashSet<AssessmentQuestion>>) sessionMap
+		.get(AssessmentConstants.ATTR_PAGED_QUESTIONS);
+	Assessment assessment = (Assessment) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT);
+	Long userId = ((AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER)).getUserId();
+	IAssessmentService service = getAssessmentService();
+	
+	//get user answers from request and store them into sessionMap
+	storeUserAnswersIntoSessionMap(request);
+	
+	// store results from sessionMap into DB
+	Long singleMarkHedgingQuestionUid = WebUtil.readLongParam(request, "singleMarkHedgingQuestionUid") ;
+	boolean isResultsStored = service.storeUserAnswers(assessment.getUid(), userId, pagedQuestions,
+		singleMarkHedgingQuestionUid, false);
+	// result was not stored in case user was prohibited from submitting (or autosubmitting) answers (e.g. when
+	// using 2 browsers). Then show last stored results
+ 	if (!isResultsStored) {
+ 	    //loadupLastAttempt(sessionMap);
+ 	}
+ 	
+ 	//find according question in order to get its mark
+	AssessmentQuestion question = null;
+	for (LinkedHashSet<AssessmentQuestion> questionsForOnePage : pagedQuestions) {
+	    for (AssessmentQuestion questionIter : questionsForOnePage) {
+		if (questionIter.getUid().equals(singleMarkHedgingQuestionUid)) {
+		    question = questionIter;
+		    question.setResponseSubmitted(true);
+		}
+	    }
+	}
+	
+	// populate info for displaying results page
+	//prepareResultsPageData(sessionMap);
+	
+ 	request.setAttribute("finishedLock", false);
+ 	request.setAttribute("assessment", assessment);
+ 	request.setAttribute("question", question);
+ 	long questionIndex = WebUtil.readLongParam(request, "questionIndex");
+ 	request.setAttribute("questionIndex", questionIndex);
+ 	request.setAttribute("isEditingDisabled", true);
+ 	request.setAttribute("isLeadershipEnabled", assessment.isUseSelectLeaderToolOuput());
+ 	request.setAttribute("isUserLeader", sessionMap.get(AssessmentConstants.ATTR_IS_USER_LEADER));
+	
+	return mapping.findForward(AssessmentConstants.SUCCESS);
+    }
+    
+    /**
      * Display same entire authoring page content from HttpSession variable.
      */
     private ActionForward submitAll(ActionMapping mapping, ActionForm form, HttpServletRequest request,
@@ -707,28 +762,43 @@
 		    }
 		    option.setAnswerBoolean(answerBoolean);
 		}
+		
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
 		for (AssessmentQuestionOption option : question.getOptions()) {
 		    int answerInt = WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_" + option.getSequenceId()); 
 		    option.setAnswerInt(answerInt);
 		}
+		
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER) {
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
 		question.setAnswerString(answerString);
+		
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
 		question.setAnswerString(answerString);
+		
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_TRUE_FALSE) {
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
 		if (answerString != null) {
 		    question.setAnswerBoolean(Boolean.parseBoolean(answerString));
 		    question.setAnswerString("answered");
 		}
+		
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ESSAY) {
 		String answerString = request.getParameter(AssessmentConstants.ATTR_QUESTION_PREFIX + i);
 		answerString = answerString.replaceAll("[\n\r\f]", "");
 		question.setAnswerString(answerString);
+		
 	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING) {
+		
+	    } else if (questionType == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
+		for (AssessmentQuestionOption option : question.getOptions()) {
+		    Integer markHedging = WebUtil.readIntParam(request, AssessmentConstants.ATTR_QUESTION_PREFIX + i + "_"
+			    + option.getSequenceId(), true);
+		    if (markHedging != null) {
+			option.setAnswerInt(markHedging);
+		    }
+		}
 	    }
 	}
     }
@@ -777,6 +847,14 @@
 
 		    } else if (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 			isAnswered = true;
+			
+		    } else if (questionType == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
+
+			int sumMarkHedging = 0;
+			for (AssessmentQuestionOption option : question.getOptions()) {
+			    sumMarkHedging += option.getAnswerInt();
+			}
+			isAnswered = sumMarkHedging == question.getGrade(); 
 		    }
 
 		    // check all questions were answered
@@ -834,6 +912,7 @@
 		for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
 		    if (question.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
 			question.setMark(questionResult.getMark());
+			question.setResponseSubmitted(questionResult.getFinishDate() != null);
 			question.setPenalty(questionResult.getPenalty());
 
 			question.setQuestionFeedback(null);
@@ -890,14 +969,29 @@
 	    return;
 	}
 	
+	//get the latest finished result (required for mark hedging type of questions only)
+	AssessmentResult lastFinishedResult = null;
+	if (lastResult.getFinishDate() == null) {
+	    lastFinishedResult = service.getLastFinishedAssessmentResult(assessmentUid, userId);
+	}
+	
 	for(LinkedHashSet<AssessmentQuestion> questionsForOnePage : pagedQuestions) {
 	    for (AssessmentQuestion question : questionsForOnePage) {
-		for (AssessmentQuestionResult questionResult : lastResult.getQuestionResults()) {
+		
+		//load last finished results for hedging type of questions (in order to prevent retry)
+		Set<AssessmentQuestionResult> questionResults = lastResult.getQuestionResults();
+		if ((question.getType() == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING)
+			&& (lastResult.getFinishDate() == null) && (lastFinishedResult != null)) {
+		    questionResults = lastFinishedResult.getQuestionResults();
+		}
+		
+		for (AssessmentQuestionResult questionResult : questionResults) {
 		    if (question.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
 			question.setAnswerBoolean(questionResult.getAnswerBoolean());
 			question.setAnswerFloat(questionResult.getAnswerFloat());
 			question.setAnswerString(questionResult.getAnswerString());
 			question.setMark(questionResult.getMark());
+			question.setResponseSubmitted(questionResult.getFinishDate() != null);
 			question.setPenalty(questionResult.getPenalty());
 			
 			for (AssessmentQuestionOption option : question.getOptions()) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -rb222d3b5e15dfb4da05a89778bfc0982f3fbd53c -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision b222d3b5e15dfb4da05a89778bfc0982f3fbd53c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -447,33 +447,33 @@
 				    assessmentUser.getUserId());
 
 			    if (assessmentResult != null) {
-				Set<AssessmentQuestionResult> assessmentQuestionResults = assessmentResult
+				Set<AssessmentQuestionResult> questionResults = assessmentResult
 					.getQuestionResults();
 
-				if (assessmentQuestionResults != null) {
+				if (questionResults != null) {
 
-				    for (AssessmentQuestionResult assessmentQuestionResult : assessmentQuestionResults) {
+				    for (AssessmentQuestionResult questionResult : questionResults) {
 
 					if (showUserNames) {
 					    ExcelCell[] userResultRow = new ExcelCell[6];
 					    userResultRow[0] = new ExcelCell(assessmentUser.getUserId(), false);
 					    userResultRow[1] = new ExcelCell(assessmentUser.getFullName(), false);
 					    userResultRow[2] = new ExcelCell(assessmentResult.getStartDate(), false);
-					    userResultRow[3] = new ExcelCell(assessmentQuestionResult
+					    userResultRow[3] = new ExcelCell(questionResult
 						    .getAssessmentQuestion().getTitle(), false);
-					    userResultRow[4] = new ExcelCell(getAnswerObject(assessmentQuestionResult),
+					    userResultRow[4] = new ExcelCell(getAnswerObject(questionResult),
 						    false);
-					    userResultRow[5] = new ExcelCell(assessmentQuestionResult.getMark(), false);
+					    userResultRow[5] = new ExcelCell(questionResult.getMark(), false);
 					    data.add(userResultRow);
 					} else {
 					    ExcelCell[] userResultRow = new ExcelCell[5];
 					    userResultRow[0] = new ExcelCell(assessmentUser.getUserId(), false);
 					    userResultRow[1] = new ExcelCell(assessmentResult.getStartDate(), false);
-					    userResultRow[2] = new ExcelCell(assessmentQuestionResult
+					    userResultRow[2] = new ExcelCell(questionResult
 						    .getAssessmentQuestion().getTitle(), false);
-					    userResultRow[3] = new ExcelCell(getAnswerObject(assessmentQuestionResult),
+					    userResultRow[3] = new ExcelCell(getAnswerObject(questionResult),
 						    false);
-					    userResultRow[4] = new ExcelCell(assessmentQuestionResult.getMark(), false);
+					    userResultRow[4] = new ExcelCell(questionResult.getMark(), false);
 					    data.add(userResultRow);
 					}
 				    }
@@ -573,27 +573,26 @@
 		    int timeTakenCount = 0;
 		    int timeTakenTotal = 0;
 		    for (List<AssessmentQuestionResult> resultList : allResultsForQuestion) {
-			for (AssessmentQuestionResult assessmentQuestionResult : resultList) {
+			for (AssessmentQuestionResult questionResult : resultList) {
 
 			    if (showUserNames) {
 				ExcelCell[] userResultRow = new ExcelCell[10];
-				userResultRow[0] = new ExcelCell(assessmentQuestionResult.getAssessmentQuestion()
-					.getTitle(), false);
-				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(assessmentQuestionResult
+				userResultRow[0] = new ExcelCell(questionResult.getAssessmentQuestion().getTitle(),
+					false);
+				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(questionResult
 					.getAssessmentQuestion().getType()), false);
-				userResultRow[2] = new ExcelCell(new Float(assessmentQuestionResult
-					.getAssessmentQuestion().getPenaltyFactor()), false);
-				Float maxMark = (assessmentQuestionResult.getMaxMark() == null) ? 0 : new Float(
-					assessmentQuestionResult.getMaxMark());
+				userResultRow[2] = new ExcelCell(new Float(questionResult.getAssessmentQuestion()
+					.getPenaltyFactor()), false);
+				Float maxMark = (questionResult.getMaxMark() == null) ? 0 : new Float(
+					questionResult.getMaxMark());
 				userResultRow[3] = new ExcelCell(maxMark, false);
-				userResultRow[4] = new ExcelCell(assessmentQuestionResult.getUser().getUserId(), false);
-				userResultRow[5] = new ExcelCell(assessmentQuestionResult.getUser().getFullName(),
-					false);
-				userResultRow[6] = new ExcelCell(assessmentQuestionResult.getFinishDate(), false);
-				userResultRow[7] = new ExcelCell(getAnswerObject(assessmentQuestionResult), false);
+				userResultRow[4] = new ExcelCell(questionResult.getUser().getUserId(), false);
+				userResultRow[5] = new ExcelCell(questionResult.getUser().getFullName(), false);
+				userResultRow[6] = new ExcelCell(questionResult.getFinishDate(), false);
+				userResultRow[7] = new ExcelCell(getAnswerObject(questionResult), false);
 
-				AssessmentResult assessmentResult = assessmentQuestionResult.getAssessmentResult();
-				Date finishDate = assessmentQuestionResult.getFinishDate();
+				AssessmentResult assessmentResult = questionResult.getAssessmentResult();
+				Date finishDate = questionResult.getFinishDate();
 				if (assessmentResult != null && finishDate != null) {
 				    Date startDate = assessmentResult.getStartDate();
 				    if (startDate != null) {
@@ -604,32 +603,32 @@
 				    }
 				}
 
-				Float mark = assessmentQuestionResult.getMark();
+				Float mark = questionResult.getMark();
 				if (mark != null) {
-				    userResultRow[9] = new ExcelCell(assessmentQuestionResult.getMark(), false);
+				    userResultRow[9] = new ExcelCell(questionResult.getMark(), false);
 				    markCount++;
-				    markTotal += assessmentQuestionResult.getMark();
+				    markTotal += questionResult.getMark();
 				}
 
 				data.add(userResultRow);
 			    } else {
 				ExcelCell[] userResultRow = new ExcelCell[9];
-				userResultRow[0] = new ExcelCell(assessmentQuestionResult.getAssessmentQuestion()
-					.getTitle(), false);
-				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(assessmentQuestionResult
+				userResultRow[0] = new ExcelCell(questionResult.getAssessmentQuestion().getTitle(),
+					false);
+				userResultRow[1] = new ExcelCell(getQuestionTypeLanguageLabel(questionResult
 					.getAssessmentQuestion().getType()), false);
-				userResultRow[2] = new ExcelCell(new Float(assessmentQuestionResult
-					.getAssessmentQuestion().getPenaltyFactor()), false);
-				Float maxMark = (assessmentQuestionResult.getMaxMark() == null) ? 0 : new Float(
-					assessmentQuestionResult.getMaxMark());
+				userResultRow[2] = new ExcelCell(new Float(questionResult.getAssessmentQuestion()
+					.getPenaltyFactor()), false);
+				Float maxMark = (questionResult.getMaxMark() == null) ? 0 : new Float(
+					questionResult.getMaxMark());
 				userResultRow[3] = new ExcelCell(maxMark, false);
-				userResultRow[4] = new ExcelCell(assessmentQuestionResult.getUser().getUserId(), false);
-				userResultRow[5] = new ExcelCell(assessmentQuestionResult.getFinishDate(), false);
-				userResultRow[6] = new ExcelCell(getAnswerObject(assessmentQuestionResult), false);
+				userResultRow[4] = new ExcelCell(questionResult.getUser().getUserId(), false);
+				userResultRow[5] = new ExcelCell(questionResult.getFinishDate(), false);
+				userResultRow[6] = new ExcelCell(getAnswerObject(questionResult), false);
 
-				if (assessmentQuestionResult.getAssessmentResult() != null) {
-				    Date startDate = assessmentQuestionResult.getAssessmentResult().getStartDate();
-				    Date finishDate = assessmentQuestionResult.getFinishDate();
+				if (questionResult.getAssessmentResult() != null) {
+				    Date startDate = questionResult.getAssessmentResult().getStartDate();
+				    Date finishDate = questionResult.getFinishDate();
 				    if (startDate != null && finishDate != null) {
 					Long seconds = (finishDate.getTime() - startDate.getTime()) / 1000;
 					userResultRow[7] = new ExcelCell(seconds, false);
@@ -638,11 +637,11 @@
 				    }
 				}
 
-				userResultRow[8] = new ExcelCell(assessmentQuestionResult.getMark(), false);
+				userResultRow[8] = new ExcelCell(questionResult.getMark(), false);
 
-				if (assessmentQuestionResult.getMark() != null) {
+				if (questionResult.getMark() != null) {
 				    markCount++;
-				    markTotal += assessmentQuestionResult.getMark();
+				    markTotal += questionResult.getMark();
 				}
 
 				data.add(userResultRow);
@@ -693,6 +692,9 @@
 	return data.toArray(new ExcelCell[][] {});
     }
 
+    /**
+     * Used only for excell export (for getUserSummaryData() method).
+     */
     private String getQuestionTypeLanguageLabel(short type) {
 	switch (type) {
 	case AssessmentConstants.QUESTION_TYPE_ESSAY:
@@ -709,65 +711,77 @@
 	    return "Short Answer";
 	case AssessmentConstants.QUESTION_TYPE_TRUE_FALSE:
 	    return "True/False";
+	case AssessmentConstants.QUESTION_TYPE_MARK_HEDGING:
+	    return "Mark Hedging";	    
 	default:
 	    return null;
 	}
     }
 
-    private Object getAnswerObject(AssessmentQuestionResult assessmentQuestionResult) {
+    /**
+     * Used only for excell export (for getUserSummaryData() method).
+     */
+    private Object getAnswerObject(AssessmentQuestionResult questionResult) {
 	Object ret = null;
 
-	if (assessmentQuestionResult != null) {
-	    switch (assessmentQuestionResult.getAssessmentQuestion().getType()) {
+	if (questionResult != null) {
+	    switch (questionResult.getAssessmentQuestion().getType()) {
 	    case AssessmentConstants.QUESTION_TYPE_ESSAY:
-		return removeHTMLTags(assessmentQuestionResult.getAnswerString());
+		return removeHTMLTags(questionResult.getAnswerString());
 	    case AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS:
-		return getOptionResponse(assessmentQuestionResult, AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS);
+		return getOptionResponse(questionResult, AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS);
 	    case AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE:
-		return getOptionResponse(assessmentQuestionResult, AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE);
+		return getOptionResponse(questionResult, AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE);
 	    case AssessmentConstants.QUESTION_TYPE_NUMERICAL:
-		return assessmentQuestionResult.getAnswerString();
+		return questionResult.getAnswerString();
 	    case AssessmentConstants.QUESTION_TYPE_ORDERING:
-		return getOptionResponse(assessmentQuestionResult, AssessmentConstants.QUESTION_TYPE_ORDERING);
+		return getOptionResponse(questionResult, AssessmentConstants.QUESTION_TYPE_ORDERING);
 	    case AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER:
-		return assessmentQuestionResult.getAnswerString();
+		return questionResult.getAnswerString();
 	    case AssessmentConstants.QUESTION_TYPE_TRUE_FALSE:
-		return assessmentQuestionResult.getAnswerBoolean();
+		return questionResult.getAnswerBoolean();
+	    case AssessmentConstants.QUESTION_TYPE_MARK_HEDGING:
+		return getOptionResponse(questionResult, AssessmentConstants.QUESTION_TYPE_MARK_HEDGING);
 	    default:
 		return null;
 	    }
 	}
 	return ret;
     }
 
-    public String getOptionResponse(AssessmentQuestionResult assessmentQuestionResult, short type) {
+    /**
+     * Used only for excell export (for getUserSummaryData() method).
+     */
+    private String getOptionResponse(AssessmentQuestionResult questionResult, short type) {
 
 	StringBuilder sb = new StringBuilder();
-	Set<AssessmentOptionAnswer> optionAnswers = assessmentQuestionResult.getOptionAnswers();
-	boolean trimComma = false;
+	//whether there is a need to remove last comma
+	boolean trimLastComma = false;
+
+	Set<AssessmentQuestionOption> options = questionResult.getAssessmentQuestion().getOptions();
+	Set<AssessmentOptionAnswer> optionAnswers = questionResult.getOptionAnswers();
 	if (optionAnswers != null) {
 
 	    if (type == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
 		for (AssessmentOptionAnswer optionAnswer : optionAnswers) {
-		    if (optionAnswer.getAnswerBoolean() == true) {
-			for (AssessmentQuestionOption option : assessmentQuestionResult.getAssessmentQuestion()
-				.getOptions()) {
+		    if (optionAnswer.getAnswerBoolean()) {
+			for (AssessmentQuestionOption option : options) {
 			    if (option.getUid().equals(optionAnswer.getOptionUid())) {
 				sb.append(option.getOptionString() + ", ");
-				trimComma = true;
+				trimLastComma = true;
 			    }
 			}
 		    }
 		}
+		
 	    } else if (type == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 		for (int i = 0; i < optionAnswers.size(); i++) {
 		    for (AssessmentOptionAnswer optionAnswer : optionAnswers) {
 			if (optionAnswer.getAnswerInt() == i) {
-			    for (AssessmentQuestionOption option : assessmentQuestionResult
-				    .getAssessmentQuestion().getOptions()) {
+			    for (AssessmentQuestionOption option : options) {
 				if (option.getUid().equals(optionAnswer.getOptionUid())) {
 				    sb.append(option.getOptionString() + ", ");
-				    trimComma = true;
+				    trimLastComma = true;
 				}
 			    }
 			}
@@ -776,13 +790,12 @@
 
 	    } else if (type == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
 
-		for (AssessmentQuestionOption option : assessmentQuestionResult.getAssessmentQuestion()
-			.getOptions()) {
+		for (AssessmentQuestionOption option : options) {
 		    sb.append("[" + option.getOptionString() + ", ");
+		    
 		    for (AssessmentOptionAnswer optionAnswer : optionAnswers) {
 			if (option.getUid().equals(optionAnswer.getOptionUid())) {
-			    for (AssessmentQuestionOption option2 : assessmentQuestionResult
-				    .getAssessmentQuestion().getOptions()) {
+			    for (AssessmentQuestionOption option2 : options) {
 				if (option2.getUid() == optionAnswer.getAnswerInt()) {
 				    sb.append(option2.getOptionString() + "] ");
 				}
@@ -791,12 +804,25 @@
 		    }
 
 		}
+		
+	    } else if (type == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
+		
+		for (AssessmentQuestionOption option : options) {
+		    sb.append("[" + option.getOptionString() + ", ");
+		    
+		    for (AssessmentOptionAnswer optionAnswer : optionAnswers) {
+			if (option.getUid().equals(optionAnswer.getOptionUid())) {
+			    sb.append(optionAnswer.getAnswerInt() + "] ");
+			}
+		    }
+
+		}
 	    }
 
 	}
 	String ret = sb.toString().replaceAll("\\<.*?\\>", "");
 
-	if (trimComma) {
+	if (trimLastComma) {
 	    ret = ret.substring(0, ret.lastIndexOf(","));
 	}
 
Index: lams_tool_assessment/web/includes/css/assessment.css
===================================================================
diff -u -r724afbcc75966e8132c8793ccbd17121491e2cc2 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision 724afbcc75966e8132c8793ccbd17121491e2cc2)
+++ lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -165,7 +165,7 @@
 	border-bottom: 1px solid white !important;
 }
 
-#warning-answers-required, #warning-words-limit, .hidden {
+#warning-answers-required, #warning-words-limit, #warning-mark-hedging-wrong-total, .hidden {
 	display: none;
 }
 
@@ -175,3 +175,7 @@
 	margin-bottom: 10px;
 	width: 80%;
 }
+
+.button-disabled {
+	opacity:.2;
+}
Index: lams_tool_assessment/web/includes/javascript/assessmentoption.js
===================================================================
diff -u -r76c5de44247cb0f2eef64361e4f5ccacdeb3d45e -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 76c5de44247cb0f2eef64361e4f5ccacdeb3d45e)
+++ lams_tool_assessment/web/includes/javascript/assessmentoption.js	(.../assessmentoption.js)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -1,10 +1,10 @@
-	/*
-	 This is Assessment Question option area.
-	 */
+	//This is Assessment Question option area.
 	var optionTargetDiv = "#optionArea";
+	
 	// 	  Please set these 2 variables in JSP file for using tag reason:
 	//    var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
 	//    var addOptionUrl = "<c:url value='/authoring/newOption.do'/>";
+	
 	function addOption(){
 		//store old InstanceIds before doing Ajax call. We need to keep record of old ones to prevent reinitializing new CKEditor two times.
 		var oldOptionIds = new Array();
@@ -25,6 +25,7 @@
 			}
 		);
 	}
+	
 	function removeOption(idx){
  		var url= removeOptionUrl;
 		var contentFolderID= $("#contentFolderID").val();
@@ -73,7 +74,7 @@
 	
 	//in order to be able to use option's value, copy it from CKEditor to textarea
 	function prepareOptionEditorsForAjaxSubmit(){
-		if ((questionType == 1) ||  (questionType == 7)) {
+		if ((questionType == 1) || (questionType == 7) || (questionType == 8)) {
 			$("textarea[name^=optionString]").each(function() {
 				prepareOptionEditorForAjaxSubmit(this);
 			});
@@ -94,5 +95,3 @@
 		//skip out empty values
 		ckeditor.value = ((ckeditorData == null) || (ckeditorData.replace(/&nbsp;| |<br \/>|\s|<p>|<\/p>|\xa0/g, "").length == 0)) ? "" : ckeditorData;
 	}
-	
-
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -rcc1b2b3fdc49088abf515c55bc8533c762e95412 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision cc1b2b3fdc49088abf515c55bc8533c762e95412)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -213,6 +213,7 @@
 		<option><fmt:message key="label.authoring.basic.type.true.false" /></option>
 		<option><fmt:message key="label.authoring.basic.type.essay" /></option>
 		<option><fmt:message key="label.authoring.basic.type.ordering" /></option>
+		<option><fmt:message key="label.authoring.basic.type.mark.hedging" /></option>
 	</select>
 	
 	<a onclick="createNewQuestionInitHref();return false;" href="" class="button-add-item space-left thickbox" id="newQuestionInitHref">  
@@ -235,12 +236,10 @@
 	</a>
 	
 	<a href="#" onClick="javascript:importQTI()" style="float: right; margin-right: 30px">
-			<fmt:message key="label.authoring.basic.import.qti" /> 
+		<fmt:message key="label.authoring.basic.import.qti" /> 
 	</a>
-	
-
 </p>
 <br>
 
 <!-- For exporting QTI packages -->
-<iframe id="downloadFileDummyIframe" style="display: none;"></iframe>
\ No newline at end of file
+<iframe id="downloadFileDummyIframe" style="display: none;"></iframe>
Index: lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -0,0 +1,226 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
+		"http://www.w3.org/TR/html4/loose.dtd">
+
+<%@ include file="/common/taglibs.jsp"%>
+<lams:html>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>
+		<link href="<html:rewrite page='/includes/css/addQuestion.css'/>" rel="stylesheet" type="text/css">
+		
+		<c:set var="ctxPath" value="${pageContext.request.contextPath}"	scope="request" />
+		<c:set var="questionType" value="8"	scope="request" />
+
+		<script type="text/javascript">
+			var questionType = ${questionType};
+			var addOptionUrl = "<c:url value='/authoring/addOption.do'/>";
+		   	var removeOptionUrl = "<c:url value='/authoring/removeOption.do'/>";
+    	    var upOptionUrl = "<c:url value='/authoring/upOption.do'/>";
+    	    var downOptionUrl = "<c:url value='/authoring/downOption.do'/>";
+		</script>
+		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/assessmentoption.js'/>"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
+  	    <script>
+			$(document).ready(function(){
+				
+		    	$("#assessmentQuestionForm").validate({
+		    		rules: {
+		    			title: "required",
+		    			defaultGrade: {
+		    			      required: true,
+		    			      digits: true
+		    			},
+		    			hasOptionFilled: {
+		    				required: function(element) {
+				    			prepareOptionEditorsForAjaxSubmit();
+		    		        	return $("textarea[name^=optionString]:filled").length < 1;
+			    		    }			    		    
+	    			    }
+		    		},
+		    		messages: {
+		    			title: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    			defaultGrade: {
+		    				required: "<fmt:message key='label.authoring.choice.field.required'/>",
+		    				digits: "<fmt:message key='label.authoring.choice.enter.integer'/>"
+		    			},
+		    			hasOptionFilled: {
+		    				required: "<fmt:message key='label.authoring.numerical.error.answer'/>"
+		    			}
+		    		},
+		    	    invalidHandler: function(form, validator) {
+		    		      var errors = validator.numberOfInvalids();
+		    		      if (errors) {
+		    		          var message = errors == 1
+		    		          	  ? "<fmt:message key='error.form.validation.error'/>"
+		    		          	  : "<fmt:message key='error.form.validation.errors'><fmt:param >" + errors + "</fmt:param></fmt:message>";
+	    		          	  
+		    		          $("div.error span").html(message);
+		    		          $("div.error").show();
+		    		      } else {
+		    		          $("div.error").hide();
+		    		      }
+		    		},
+		    		debug: true,
+     			    submitHandler: function(form) {
+     			    	prepareOptionEditorsForAjaxSubmit();
+		    			$("#optionList").val($("#optionForm").serialize(true));
+		    			$("#question").val(CKEDITOR.instances.question.getData());
+		    			$("#generalFeedback").val(CKEDITOR.instances.generalFeedback.getData());
+		    			$("#feedbackOnCorrect").val(CKEDITOR.instances.feedbackOnCorrectOutsideForm.getData());
+		    			$("#feedbackOnPartiallyCorrect").val(CKEDITOR.instances.feedbackOnPartiallyCorrectOutsideForm.getData());
+		    			$("#feedbackOnIncorrect").val(CKEDITOR.instances.feedbackOnIncorrectOutsideForm.getData());
+		    			
+		    	    	var options = { 
+		    	    		target:  parent.jQuery('#questionListArea'), 
+		    		   		success: afterRatingSubmit  // post-submit callback
+		    		    }; 				
+		    		    				
+		    			$('#assessmentQuestionForm').ajaxSubmit(options);
+		    		}
+		  		});
+		    	
+		    	
+			});
+    		// post-submit callback 
+    		function afterRatingSubmit(responseText, statusText)  { 
+    			self.parent.refreshThickbox()
+    			self.parent.tb_remove();
+    		}    
+  		</script>
+		
+	</lams:head>
+	
+	<body class="stripes" onload="parent.resizeIframe();">
+		<div id="content" >	
+			<%@ include file="/common/messages.jsp"%>
+		    <div class="error" style="display:none;">
+		      	<img src="${ctxPath}/includes/images/warning.gif" alt="Warning!" width="24" height="24" style="float:left; margin: -5px 10px 0px 0px; " />
+		      	<span></span>.<br clear="all"/>
+		    </div>			
+			
+			<html:form action="/authoring/saveOrUpdateQuestion" method="post" styleId="assessmentQuestionForm">
+				<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+				<html:hidden property="sessionMapID" />
+				<input type="hidden" name="questionType" id="questionType" value="${questionType}" />
+				<input type="hidden" name="optionList" id="optionList" />
+				<html:hidden property="questionIndex" />
+				<html:hidden property="contentFolderID" styleId="contentFolderID"/>
+				<html:hidden property="feedbackOnCorrect" styleId="feedbackOnCorrect"/>
+				<html:hidden property="feedbackOnPartiallyCorrect" styleId="feedbackOnPartiallyCorrect"/>
+				<html:hidden property="feedbackOnIncorrect" styleId="feedbackOnIncorrect"/>
+	
+				<h2 class="no-space-left">
+					<fmt:message key="label.authoring.basic.type.multiple.choice" />
+				</h2>
+	
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.question.name" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				</div>
+				<html:text property="title" />
+	
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.question.text" />
+				</div>
+				<lams:CKEditor id="question" value="${formBean.question}"
+					contentFolderID="${formBean.contentFolderID}" >
+				</lams:CKEditor>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.default.question.grade" />
+					<img title="Required field" alt="Required field" src="${ctxPath}/includes/images/req.gif" />
+				</div>
+				<html:text property="defaultGrade" styleClass="shortInputText" />
+				
+				<div class="field-name space-top" >
+					<html:checkbox property="answerRequired" styleId="answer-required"/>
+					<label for="answer-required">
+						<fmt:message key="label.authoring.answer.required" />
+					</label>
+				</div>
+				
+				<div class="field-name space-top">
+					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
+
+					<a href="javascript:toggleVisibility('general-feedback');" >
+						<fmt:message key="label.authoring.basic.general.feedback" />
+					</a>
+				</div>
+				<div id="general-feedback" class="hidden">
+					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
+						contentFolderID="${formBean.contentFolderID}"> 
+					</lams:CKEditor>
+				</div>
+	
+				<div class="field-name space-top" >
+					<html:checkbox property="shuffle" styleId="shuffle"/>
+					<label for="shuffle">
+						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
+					</label>
+				</div>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.basic.answer.options" />
+				</div>
+				<input type="text" name="hasOptionFilled" id="hasOptionFilled" class="fake-validation-input">
+			</html:form>
+			
+			<!-- Options -->
+			<form id="optionForm" name="optionForm">
+				<%@ include file="optionlist.jsp"%>
+				<a href="javascript:;" onclick="addOption();" class="button-add-item right-buttons" style="margin-right: 40px; margin-top:0px">
+					<fmt:message key="label.authoring.choice.add.option" /> 
+				</a>
+			</form>
+			
+			<!-- Overall feedback -->
+			<div class="field-name " style="margin-top: 60px;">
+				<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('overall-feedback');" />
+
+				<a href="javascript:toggleVisibility('overall-feedback');" >
+					<fmt:message key="label.authoring.choice.overall.feedback" />
+				</a>
+			</div>
+			<div id="overall-feedback" class="hidden">
+				<div class="field-name" >
+					<fmt:message key="label.authoring.choice.feedback.on.correct" />
+				</div>
+				<lams:CKEditor id="feedbackOnCorrectOutsideForm" value="${formBean.feedbackOnCorrect}"
+					contentFolderID="${formBean.contentFolderID}">
+				</lams:CKEditor>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.choice.feedback.on.partially.correct" />
+				</div>
+				<lams:CKEditor id="feedbackOnPartiallyCorrectOutsideForm" value="${formBean.feedbackOnPartiallyCorrect}"
+					contentFolderID="${formBean.contentFolderID}">
+				</lams:CKEditor>
+				
+				<div class="field-name space-top">
+					<fmt:message key="label.authoring.choice.feedback.on.incorrect" />
+				</div>
+				<lams:CKEditor id="feedbackOnIncorrectOutsideForm" value="${formBean.feedbackOnIncorrect}"
+					contentFolderID="${formBean.contentFolderID}">
+				</lams:CKEditor>
+			</div>
+			<br><br>
+			
+			<lams:ImgButtonWrapper>
+				<a href="#" onclick="$('#assessmentQuestionForm').submit();" onmousedown="self.focus();" class="button-add-item">
+					<fmt:message key="label.authoring.choice.add.multiple.choice" /> 
+				</a>
+				<a href="#" onclick="self.parent.tb_remove();" onmousedown="self.focus();" class="button space-left">
+					<fmt:message key="label.cancel" /> 
+				</a>
+			</lams:ImgButtonWrapper>
+
+		</div>
+		<!--closes content-->
+	
+		<div id="footer">
+		</div>
+		<!--closes footer-->		
+		
+	</body>
+</lams:html>
Index: lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/authoring/parts/optionhedgingmark.jsp	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -0,0 +1,43 @@
+<table>
+	<tr>
+		<td style="padding-left:10px; border-bottom:0px; vertical-align:middle; background:none;">
+			<input type="hidden" name="optionSequenceId${status.index}" id="optionSequenceId${status.index}" value="${option.sequenceId}">
+			<span class="field-name">
+				<fmt:message key="label.authoring.basic.option.answer"></fmt:message>
+				${status.index+1}
+			</span>
+		</td>
+	</tr>
+	
+	<tr>		
+		<td style="padding-left:10px; border-bottom:0px; background:none;">	
+			<lams:CKEditor id="optionString${status.index}" value="${option.optionString}"
+				contentFolderID="${contentFolderID}" >
+			</lams:CKEditor>					
+		</td>									
+	</tr>
+
+	<tr>
+		<td style="border-bottom:0px; vertical-align:top; background:none;" class="right-buttons">
+			<input type="radio" alt="${status.index}" name="optionCorrect" value="${option.sequenceId}" <c:if test="${option.correct}">checked="checked"</c:if> >
+								
+			<span class="field-name">
+				<fmt:message key="label.option.correct" />
+			</span>
+		</td>
+	</tr>
+
+	<tr>
+		<td style="padding-left:10px; border-bottom:0px; vertical-align:top; background:none;">
+			<span class="field-name">
+				<fmt:message key="label.authoring.basic.option.feedback"></fmt:message>
+			</span>
+		</td>
+	</tr>
+	
+	<tr>		
+		<td style="padding-left:10px; padding-right:0px; border-bottom:0px; background:none;" width="622px">
+			<lams:STRUTS-textarea property="optionFeedback${status.index}" rows="3" value="${option.feedback}"/>
+		</td>
+	</tr>
+</table>
Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp
===================================================================
diff -u -r72100e7842f4ba7a26156d51d620235e5af78d5b -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 72100e7842f4ba7a26156d51d620235e5af78d5b)
+++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp	(.../optionlist.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -16,13 +16,16 @@
 						</c:when>
 						<c:when test="${questionType == 3}">
 							<%@ include file="shortansweroption.jsp"%>
-						</c:when>						
+						</c:when>					
 						<c:when test="${questionType == 4}">
 							<%@ include file="numericaloption.jsp"%>
-						</c:when>	
+						</c:when>
 						<c:when test="${questionType == 7}">
 							<%@ include file="orderingoption.jsp"%>
-						</c:when>											
+						</c:when>
+						<c:when test="${questionType == 8}">
+							<%@ include file="optionhedgingmark.jsp"%>
+						</c:when>
 					</c:choose>	
 				</td>
 					
Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
===================================================================
diff -u -re83e4b897113057714ced4be6d03a621c782b075 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision e83e4b897113057714ced4be6d03a621c782b075)
+++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(.../questionlist.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -48,7 +48,10 @@
 							</c:when>
 							<c:when test="${question.type == 7}">
 								<fmt:message key="label.authoring.basic.type.ordering" />
-							</c:when>							
+							</c:when>
+							<c:when test="${question.type == 8}">
+								<fmt:message key="label.authoring.basic.type.mark.hedging" />
+							</c:when>
 						</c:choose>
 					</span>
 				</td>
@@ -161,7 +164,10 @@
 							</c:when>
 							<c:when test="${question.type == 7}">
 								<fmt:message key="label.authoring.basic.type.ordering" />
-							</c:when>							
+							</c:when>
+							<c:when test="${question.type == 8}">
+								<fmt:message key="label.authoring.basic.type.mark.hedging" />
+							</c:when>
 						</c:choose>
 					</span>
 				</td>
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r0f1867f956a900cf3ae3269f2f47d81c96cbda85 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 0f1867f956a900cf3ae3269f2f47d81c96cbda85)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -84,6 +84,35 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
 	
 	<script type="text/javascript">
+		$(document).ready(function(){
+			
+			//if isLeadershipEnabled - enable/disable submit buttons
+			if (${isLeadershipEnabled}) {
+				$(".mark-hedging-select").on('change', function() {
+					var questionIndex = $(this).data("question-index");
+					var grade = eval($(this).find('option:last-child').val());
+					
+					var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
+					
+					//if totalSelected equals to question's grade - show button
+					if (totalSelected == grade) {
+						$("[type=button][name=submit-hedging-question" + questionIndex + "]").prop("disabled", "").removeClass("button-disabled");
+					} else {
+						$("[type=button][name=submit-hedging-question" + questionIndex + "]").prop("disabled", "true").addClass("button-disabled");
+					}
+				}).trigger("change");
+			}
+
+		});
+		
+		function countHedgeQuestionSelectTotal(questionIndex) {
+			var totalSelected = 0;
+			$("select[name^=question" + questionIndex + "_]").each(function() {
+				totalSelected += eval(this.value);
+			});
+			return totalSelected;
+		}
+	
 		//boolean to indicate whether ok dialog is still ON so that autosave can't be run
 		var isWaitingForConfirmation = ${not finishedLock && assessment.timeLimit > 0 && empty param.secondsLeft};
 	
@@ -200,13 +229,15 @@
 			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
 			return false;
 		}
+		
 		function continueReflect(){
 			if (!validateAnswers()) {
 				return;
 			}
 			
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
+		
 		function nextPage(pageNumber){
 			if (!validateAnswers()) {
 				return;
@@ -221,6 +252,7 @@
         	myForm.attr("action", "<c:url value='/learning/nextPage.do?sessionMapID=${sessionMapID}&pageNumber='/>" + pageNumber + "&secondsLeft=" + secondsLeft);
         	myForm.submit();
 		}
+		
 		function submitAll(isTimelimitExpired){
 			
 			var secondsLeft = 0;
@@ -241,7 +273,25 @@
         	var myForm = $("#answers");
         	myForm.attr("action", "<c:url value='/learning/submitAll.do?sessionMapID=${sessionMapID}'/>&secondsLeft=" + secondsLeft + "&isTimelimitExpired=" + isTimelimitExpired);
         	myForm.submit();
-		}	
+		}
+		
+		function submitSingleMarkHedgingQuestion(singleMarkHedgingQuestionUid, questionIndex){
+			
+			//only if time limit is not expired
+			if ((typeof isTimelimitExpired !== 'undefined') && isTimelimitExpired) {
+				return;
+			}
+			
+			//ajax form submit
+			$('#answers').ajaxSubmit({
+				url: "<c:url value='/learning/submitSingleMarkHedgingQuestion.do'/>?sessionMapID=${sessionMapID}&singleMarkHedgingQuestionUid=" + singleMarkHedgingQuestionUid +"&questionIndex="+ questionIndex +"&date=" + new Date().getTime(),
+				target: '#mark-hedging-question-' + singleMarkHedgingQuestionUid,
+                success: function() {
+                	$('#question-area-' + questionIndex).removeClass('warning-answer-required');
+                }
+			});
+		}		
+		
 		function resubmit(){
 			document.location.href ="<c:url value='/learning/resubmit.do?sessionMapID=${sessionMapID}'/>";
 			return false;			
@@ -301,6 +351,7 @@
 			var missingRequiredQuestions = [];
 			var minWordsLimitNotReachedQuestions = [];
 			var maxWordsLimitExceededQuestions = [];
+			var markHedgingWrongTotalQuestions = [];
 			
 			<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
 				<c:if test="${question.answerRequired}">
@@ -353,6 +404,20 @@
 						<c:when test="${question.type == 7}">
 							//ordering - do nothing
 						</c:when>
+							
+						<c:when test="${question.type == 8}">
+							//mark hedging
+							
+						//	var questionIndex = ${status.index};
+						//	var grade = ${question.grade};
+						//	var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
+					
+							//if totalSelected not equals to question's grade - show warning
+						//	if (totalSelected != grade) {
+						//		markHedgingWrongTotalQuestions.push("${status.index}");
+						//	}
+							
+						</c:when>
 					</c:choose>
 				</c:if>
 				
@@ -373,18 +438,42 @@
 						minWordsLimitNotReachedQuestions.push("${status.index}");
 					}
 				</c:if>
+				
+				//mark hedging question and leader aware feature is ON => question is required to answer
+				<c:if test="${question.type == 8}">
+				
+					var questionIndex = ${status.index};
+					
+					if (${isLeadershipEnabled}) {
+						if ($("[type=button][name=submit-hedging-question"+ questionIndex +"]").length > 0) {
+							missingRequiredQuestions.push("${status.index}");
+						}
+						
+					} else {
+						var grade = ${question.grade};
+						var totalSelected = countHedgeQuestionSelectTotal(questionIndex);
+				
+						//if totalSelected not equals to question's grade - show warning
+						if (totalSelected != grade) {
+							markHedgingWrongTotalQuestions.push("${status.index}");
+						}
+					}
+					
+				</c:if>
+				
 			</c:forEach>
 			
 			//return true in case all required questions were answered, false otherwise
 			if (missingRequiredQuestions.length == 0 && minWordsLimitNotReachedQuestions.length == 0 
-					&& maxWordsLimitExceededQuestions.length == 0) {
+					&& maxWordsLimitExceededQuestions.length == 0 && markHedgingWrongTotalQuestions.length == 0) {
 				return true;
 				
 			} else {
 				//remove .warning-answer-required from all questions
 				$('[id^=question-area-]').removeClass('warning-answer-required');
 				$('#warning-answers-required').hide();
 				$('#warning-words-limit').hide();
+				$('#warning-mark-hedging-wrong-total').hide();
 				
 				if (missingRequiredQuestions.length != 0) {
 					//add .warning-answer-required class to those needs to be filled
@@ -414,6 +503,15 @@
 					$("#warning-words-limit").show();		
 				}
 				
+				if (markHedgingWrongTotalQuestions.length != 0) {
+					//add .warning-answer-required class to those needs to be filled
+					for (i = 0; i < markHedgingWrongTotalQuestions.length; i++) {
+					    $("#question-area-" + markHedgingWrongTotalQuestions[i]).addClass('warning-answer-required');
+					}
+					//show alert message as well
+					$("#warning-mark-hedging-wrong-total").show();		
+				}
+				
 				$("html, body").animate({ scrollTop: 0 }, "slow");//window.scrollTo(0, 0);
 				
 				return false;
@@ -478,6 +576,10 @@
 			<fmt:message key="warn.answers.word.requirements.limit" />
 		</div>
 		
+		<div class="warning" id="warning-mark-hedging-wrong-total">
+			<fmt:message key="warn.mark.hedging.wrong.total" />
+		</div>
+		
 		<div id="timelimit-start-dialog"> 
 	        <h1>
 	        	<fmt:message key='label.learning.blockui.are.you.ready' />
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r3e771e28271a0ef14f3989fe84231546420df296 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 3e771e28271a0ef14f3989fe84231546420df296)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -44,6 +44,13 @@
 						<c:when test="${question.type == 7}">
 							<%@ include file="ordering.jsp"%>
 						</c:when>
+						<c:when test="${question.type == 8}">
+							<c:set var="questionIndex" value="${status.index}"/>
+							
+							<div id="mark-hedging-question-${question.uid}">
+								<%@ include file="markhedging.jsp"%>
+							</div>
+						</c:when>						
 					</c:choose>
 							
 					<%@ include file="questionsummary.jsp"%>
Index: lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/learning/parts/markhedging.jsp	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -0,0 +1,109 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<div class="question-type">
+	<fmt:message key="label.assign.hedging.mark">
+		<fmt:param>${question.grade}</fmt:param>
+	</fmt:message>
+</div>
+
+<table class="question-table">
+	<c:forEach var="option" items="${question.options}">
+		<tr>
+			<c:if test="${finishedLock || question.responseSubmitted}">
+				<td class="complete-item-gif">
+				
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && option.correct}">
+						<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">
+					</c:if>
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !option.correct}">
+						<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">
+					</c:if>
+						
+				</td>
+			</c:if>
+			
+			<td class="question-option">
+				<c:out value="${option.optionString}" escapeXml="false" />
+			</td>
+			
+			<td class="has-radio-button">
+			
+				<select name="question${questionIndex}_${option.sequenceId}" class="mark-hedging-select" data-question-index="${questionIndex}"
+					<c:if test="${isEditingDisabled || question.responseSubmitted}">disabled="disabled"</c:if>				
+				>
+					
+					<c:forEach var="i" begin="0" end="${question.grade}">
+						<option
+							<c:if test="${option.answerInt == i}">selected="selected"</c:if>						
+						>${i}</option>
+					</c:forEach>
+					
+				</select>
+			</td>
+			
+			<c:if test="${(finishedLock || question.responseSubmitted) && assessment.allowQuestionFeedback}">
+
+				<c:choose>
+                	<c:when test="${option.correct}">
+                    	<c:set var="color" scope="page" value="red" />
+        			</c:when>
+					<c:otherwise>
+                    	<c:set var="color" scope="page" value="blue" />
+        			</c:otherwise>
+        		</c:choose>
+
+				<td width="30%" style="padding:5px 10px 2px; font-style: italic; color:${color};">
+					<c:if test="${option.answerInt > 0}">
+						<c:out value="${option.feedback}" escapeXml="false" />
+					</c:if>
+				</td>
+			</c:if>
+			
+		</tr>
+	</c:forEach>
+</table>
+
+<c:if test="${!finishedLock && !question.responseSubmitted && isLeadershipEnabled && isUserLeader}">
+	<div>
+		<html:button property="submit-hedging-question${questionIndex}" onclick="return submitSingleMarkHedgingQuestion(${question.uid}, ${questionIndex});" 
+				styleClass="button">
+			<fmt:message key="label.learning.submit" />
+		</html:button>
+	</div>
+</c:if>
+
+<c:if test="${finishedLock || question.responseSubmitted}">
+	<c:if test="${assessment.allowQuestionFeedback}">
+		<div class="question-feedback">
+			<c:choose>
+				<c:when test="${question.mark == question.grade}">
+					<c:out value="${question.feedbackOnCorrect}" escapeXml="false" />
+				</c:when>
+				<c:when test="${question.mark > 0}">
+					<c:out value="${question.feedbackOnPartiallyCorrect}" escapeXml="false" />
+				</c:when>
+				<c:when test="${question.mark <= 0}">
+					<c:out value="${question.feedbackOnIncorrect}" escapeXml="false" />
+				</c:when>		
+			</c:choose>
+		</div>
+	</c:if>
+
+	<c:if test="${assessment.allowQuestionFeedback && (question.generalFeedback != null)}">
+		<div class="question-feedback">
+			<c:out value="${question.generalFeedback}" escapeXml="false" />
+		</div>
+	</c:if>
+	
+	<div class="question-feedback" style="padding-bottom: 10px;">
+		<fmt:message key="label.learning.marks" >
+			<fmt:param><fmt:formatNumber value="${question.mark}" maxFractionDigits="3"/></fmt:param>
+			<fmt:param>${question.grade}</fmt:param>
+		</fmt:message>
+		<c:if test="${(question.mark != question.grade) && (fn:length(question.questionResults) > 1)}">
+			<fmt:message key="label.learning.penalty" >
+				<fmt:param><fmt:formatNumber value="${question.penalty}" maxFractionDigits="2"/></fmt:param>
+			</fmt:message>
+		</c:if>
+	</div>
+</c:if>
Index: lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
===================================================================
diff -u -r6e5d1ff4891084bef035cb865c1a395e3eb49ab0 -r11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa
--- lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision 6e5d1ff4891084bef035cb865c1a395e3eb49ab0)
+++ lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp	(.../userresponse.jsp)	(revision 11d6b3d1391ab1d1aa42453aa0347a6b85fcfeaa)
@@ -10,6 +10,7 @@
 								</c:forEach>					
 							</c:forEach>						
 						</c:when>
+						
 						<c:when test="${question.type == 2}">
 							<c:forEach var="option" items="${question.options}">
 								responseStr +='<div>';
@@ -30,24 +31,27 @@
 									responseStr +='</div>';
 								responseStr +='</div>';
 								responseStr +='<br>';
-								
 							</c:forEach>
-
 						</c:when>
+						
 						<c:when test="${question.type == 3}">
 							responseStr +="${fn:escapeXml(questionResult.answerStringEscaped)}";
 						</c:when>
+						
 						<c:when test="${question.type == 4}">
 							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
+						
 						<c:when test="${question.type == 5}">
 							<c:if test="${questionResult.answerString != null}">			
 								responseStr +="${questionResult.answerBoolean}";
 							</c:if>
 						</c:when>
+						
 						<c:when test="${question.type == 6}">
 							responseStr +="${questionResult.answerStringEscaped}";
 						</c:when>
+						
 						<c:when test="${question.type == 7}">
 							<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
 								<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
@@ -60,6 +64,25 @@
 									</c:if>								
 								</c:forEach>
 							</c:forEach>
+						</c:when>
+						
+						<c:when test="${question.type == 8}">
+							<c:forEach var="option" items="${question.options}">
+								responseStr +='<div>';
+									responseStr +='<div style="float: left;">';
+										responseStr +="${option.optionStringEscaped}";
+									responseStr +='</div>';
+									responseStr +='<div style=" float: right; width: 20%;">';
+										responseStr +=' - '; 
+										<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+											<c:if test="${option.uid == optionAnswer.optionUid}">
+												responseStr +="${optionAnswer.answerInt}";
+											</c:if>
+										</c:forEach>										
+									responseStr +='</div>';
+								responseStr +='</div>';
+								responseStr +='<br>';
+							</c:forEach>					
 						</c:when>						
 	
 					</c:choose>
\ No newline at end of file