Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r4a855e1d754a0564643bff058bc0f80948ab6e08 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 4a855e1d754a0564643bff058bc0f80948ab6e08)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -277,5 +277,12 @@
 label.authoring.basic.export.qti  =Export IMS QTI
 label.monitoring.heading  =Assessment Monitoring
 
+label.maximum.number.words  =Maximum number of words
+label.minimum.number.words  =Minimum number of words
+label.info.maximum.number.words  =The instructor set the maximum allowed number of words for this question: {0} 
+label.info.minimum.number.words  =The instructor set the minimum required number of words for this question: {0}
+warn.answers.doesnt.reach.min.words.limit  =In order to continue, please expand your answers to reach the minimum number of words limit.
+warn.answers.exceed.max.words.limit  =In order to continue, please shorten your answers to comply with maximum number of words limit.
+label.words  =Words:
 
 #======= End labels: Exported 270 labels for en AU =====
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r38b6d49113930570f68778048950c2df1875a6be -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 38b6d49113930570f68778048950c2df1875a6be)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -201,7 +201,7 @@
     
     public static final String ATTR_IS_USER_FAILED = "isUserFailed";
     
-    public static final String ATTR_IS_REQUIRED_ANSWER_MISSED = "isRequiredAnswerMissed";
+    public static final String ATTR_IS_ANSWERS_VALIDATION_FAILED = "isAnswersValidationFailed";
     
     public static final String ATTR_FINISHED_LOCK = "finishedLock";
     
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140723.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140723.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140723.sql	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -0,0 +1,15 @@
+-- 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-
+ALTER TABLE tl_laasse10_assessment_question ADD COLUMN max_words_limit integer;
+ALTER TABLE tl_laasse10_assessment_question ADD COLUMN min_words_limit integer;
+
+----------------------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 -r3e771e28271a0ef14f3989fe84231546420df296 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision 3e771e28271a0ef14f3989fe84231546420df296)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java	(.../AssessmentQuestion.java)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -92,6 +92,11 @@
     
     private Set<AssessmentUnit> units;
     
+    //only for essay type of question
+    private int maxWordsLimit;
+    //only for essay type of question
+    private int minWordsLimit;
+    
     // DTO fields:
     private String answerString;
     
@@ -491,6 +496,42 @@
 	this.units = units;
     }
     
+    /**
+     * maxWordsLimit set in author. Used only for essay type of questions
+     * 
+     * @hibernate.property column="max_words_limit"
+     * 
+     * @return
+     */
+    public int getMaxWordsLimit() {
+	return maxWordsLimit;
+    }
+
+    /**
+     * @param maxWordsLimit set in author. Used only for essay type of questions
+     */
+    public void setMaxWordsLimit(int maxWordsLimit) {
+	this.maxWordsLimit = maxWordsLimit;
+    }
+    
+    /**
+     * minWordsLimit set in author. Used only for essay type of questions
+     * 
+     * @hibernate.property column="min_words_limit"
+     * 
+     * @return
+     */
+    public int getMinWordsLimit() {
+	return minWordsLimit;
+    }
+
+    /**
+     * @param minWordsLimit set in author. Used only for essay type of questions
+     */
+    public void setMinWordsLimit(int minWordsLimit) {
+	this.minWordsLimit = minWordsLimit;
+    }
+    
     public String getAnswerString() {
 	return answerString;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -r38b6d49113930570f68778048950c2df1875a6be -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 38b6d49113930570f68778048950c2df1875a6be)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -1674,6 +1674,8 @@
 	form.setCaseSensitive(question.isCaseSensitive());
 	form.setCorrectAnswer(question.getCorrectAnswer());
 	form.setAllowRichEditor(question.isAllowRichEditor());
+	form.setMaxWordsLimit(question.getMaxWordsLimit());
+	form.setMinWordsLimit(question.getMinWordsLimit());
 	if (questionIdx >= 0) {
 	    form.setQuestionIndex(new Integer(questionIdx).toString());
 	}
@@ -1759,6 +1761,8 @@
 	    question.setFeedbackOnIncorrect(questionForm.getFeedbackOnIncorrect());
 	} else if ((type == AssessmentConstants.QUESTION_TYPE_ESSAY)) {
 	    question.setAllowRichEditor(questionForm.isAllowRichEditor());
+	    question.setMaxWordsLimit(questionForm.getMaxWordsLimit());
+	    question.setMinWordsLimit(questionForm.getMinWordsLimit());
 	} else if (type == AssessmentConstants.QUESTION_TYPE_ORDERING) {
 	    question.setPenaltyFactor(Float.parseFloat(questionForm.getPenaltyFactor()));
 	    question.setFeedbackOnCorrect(questionForm.getFeedbackOnCorrect());
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r38b6d49113930570f68778048950c2df1875a6be -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 38b6d49113930570f68778048950c2df1875a6be)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -433,11 +433,11 @@
 	storeUserAnswersIntoSessionMap(request);
 	
 	//check all required questions got answered
-	int pageNumberWithUnasweredQuestions = checkAllRequiredQuestionsAnswered(sessionMap);
+	int pageNumberWithUnasweredQuestions = validateAnswers(sessionMap);
 	//if some were not then forward to nextPage()
 	if (pageNumberWithUnasweredQuestions != 0) {
 	    request.setAttribute(AssessmentConstants.ATTR_PAGE_NUMBER, pageNumberWithUnasweredQuestions);
-	    request.setAttribute(AssessmentConstants.ATTR_IS_REQUIRED_ANSWER_MISSED, true);
+	    request.setAttribute(AssessmentConstants.ATTR_IS_ANSWERS_VALIDATION_FAILED, true);
 	    
 	    return nextPage(mapping, form, request, response);
 	}
@@ -724,24 +724,24 @@
     }
     
     /**
-     * Checks whether all questions set as requiring an answer was answered.
+     * Checks whether all required questions were answered and all essay question with min words limit have fullfilled that.
      * 
      * @param sessionMap
-     * @return 0 if all required questions were answered, or number of a page that contains unanswered question
+     * @return 0 if all questions were answered OK, or a number of the first page that contains questions with issues
      */
-    private int checkAllRequiredQuestionsAnswered(SessionMap<String, Object> sessionMap){
+    private int validateAnswers(SessionMap<String, Object> sessionMap){
 
 	ArrayList<LinkedHashSet<AssessmentQuestion>> pagedQuestions = (ArrayList<LinkedHashSet<AssessmentQuestion>>) sessionMap.get(AssessmentConstants.ATTR_PAGED_QUESTIONS);
 	
 	//array of missing required questions
 	boolean isAllQuestionsAnswered = true;
+	boolean isAllQuestionsReachedMinWordsLimit = true;
 
 	//iterate through all pages to find first that contains missing required questions
 	int pageCount;
 	for (pageCount = 0; pageCount < pagedQuestions.size(); pageCount++) {
 	    LinkedHashSet<AssessmentQuestion> questionsForOnePage = pagedQuestions.get(pageCount);
 	    
-	    int questionCount = 0;
 	    for (AssessmentQuestion question : questionsForOnePage) {
 		if (question.isAnswerRequired()) {
 
@@ -776,12 +776,30 @@
 		    }
 
 		}
+		
+		if ((question.getType() == AssessmentConstants.QUESTION_TYPE_ESSAY)
+			&& (question.getMinWordsLimit() > 0)) {
 
-		questionCount++;
+		    String answer = new String(question.getAnswerString());
+		    
+		    // HTML tags stripping
+		    if (question.isAllowRichEditor()) {
+			answer = WebUtil.removeHTMLtags(answer); // answer.replaceAll("/<\/?[a-z][^>]*>/gi", '');
+		    }
+		    
+		   int wordCount = (answer.length() == 0) ? 0 : answer.replaceAll("[\'\";:,\\.\\?\\-!]+", "").split("\\S+").length;//.match(/\S+/g) || []) ;
+
+		    // check min words limit is reached
+		    if (wordCount < question.getMinWordsLimit()) {
+			isAllQuestionsReachedMinWordsLimit = false;
+			break;
+		    }
+
+		}
 	    }
 	    
-	    //if found un-answered question, stop here
-	    if (!isAllQuestionsAnswered) {
+	    //if found answers required to be fixed by learners, stop here
+	    if (!isAllQuestionsAnswered || !isAllQuestionsReachedMinWordsLimit) {
 		return pageCount + 1;
 	    }
 	}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
===================================================================
diff -u -r3e771e28271a0ef14f3989fe84231546420df296 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java	(.../AssessmentQuestionForm.java)	(revision 3e771e28271a0ef14f3989fe84231546420df296)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java	(.../AssessmentQuestionForm.java)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -57,6 +57,8 @@
     private boolean caseSensitive;
     private boolean correctAnswer;
     private boolean allowRichEditor;
+    private int maxWordsLimit;
+    private int minWordsLimit;
 
     public String getSessionMapID() {
 	return sessionMapID;
@@ -217,5 +219,21 @@
     public void setAllowRichEditor(boolean allowRichEditor) {
 	this.allowRichEditor = allowRichEditor;
     }
+    
+    public int getMaxWordsLimit() {
+	return maxWordsLimit;
+    }
 
+    public void setMaxWordsLimit(int maxWordsLimit) {
+	this.maxWordsLimit = maxWordsLimit;
+    }
+    
+    public int getMinWordsLimit() {
+	return minWordsLimit;
+    }
+
+    public void setMinWordsLimit(int minWordsLimit) {
+	this.minWordsLimit = minWordsLimit;
+    }
+
 }
Index: lams_tool_assessment/web/includes/css/addQuestion.css
===================================================================
diff -u -r4d14e04ecb649047c874d2c9189a20a86212159d -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/includes/css/addQuestion.css	(.../addQuestion.css)	(revision 4d14e04ecb649047c874d2c9189a20a86212159d)
+++ lams_tool_assessment/web/includes/css/addQuestion.css	(.../addQuestion.css)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -1,9 +1,34 @@
-label { width: 10em; float: left; }
-label.error { float: none; color: red; padding-left: .5em; vertical-align: top; font-weight: bold; font-style: italic;}
-em { font-weight: bold; padding-right: 1em; vertical-align: top; }
-input.error { border: 2px solid red;}
-#content {width: 91%; margin-bottom: 10px;}
-table.alternative-color td {padding-left: 0;}
-input[type=text].shortInputText {width:10%;}
-input[type=text] {width:98%;}
-textarea {width:98%;}
+label.error { 
+	float: none; color: red; padding-left: .5em; vertical-align: top; font-weight: bold; font-style: italic;
+}
+em { 
+	font-weight: bold; padding-right: 1em; vertical-align: top; 
+}
+input.error { 
+	border: 2px solid red;
+}
+#content {
+	width: 91%; margin-bottom: 10px;
+}
+table.alternative-color td {
+	padding-left: 0;
+}
+input[type=text].shortInputText {
+	width:10%;
+}
+input[type=text] {
+	width:98%;
+}
+textarea {
+	width:98%;
+}
+
+.word-limit-label {
+	margin-right: 7px;
+}
+
+#max-words-limit-checkbox, #min-words-limit-checkbox {
+	vertical-align: sub;
+}
+
+
Index: lams_tool_assessment/web/includes/css/assessment.css
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/includes/css/assessment.css	(.../assessment.css)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -147,7 +147,6 @@
 	color:#47bc23;
 }
 
-
 #pager {
 	text-align: center; 
 	padding-top: 60px;
@@ -166,10 +165,13 @@
 	border-bottom: 1px solid white !important;
 }
 
-#warning-answers-required {
+#warning-answers-required, #warning-max-words-limit, #warning-min-words-limit, .hidden {
 	display: none;
 }
 
-.hidden {
-	display: none;
+.reg-padding .info {
+	margin-top: 10px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	width: 80%;
 }
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp	(.../addessay.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -4,13 +4,15 @@
 <%@ include file="/common/taglibs.jsp"%>
 <lams:html>
 	<lams:head>
+		<link href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" rel="stylesheet" type="text/css" >
 		<%@ 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" />
 		
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.validate.pack.js"></script>
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.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>
 	    
@@ -56,7 +58,34 @@
 		    			$('#assessmentQuestionForm').ajaxSubmit(options);
 		    		}
 		  		});
+		    	
+		    	//spinner
+		    	var maximumWordsSpinner = $( "#max-words-limit" ).spinner({ 
+		    		min: 0,
+		    		disabled: ($( "#max-words-limit" ).val() == 0)
+		    	});
+		    	$("#max-words-limit-checkbox").click(function() {
+		    		if ( maximumWordsSpinner.spinner( "option", "disabled" ) ) {
+		    			 maximumWordsSpinner.spinner( "enable" );
+		    		} else {
+		    			maximumWordsSpinner.spinner( "disable" );
+		    		}
+		        });
+		    	
+		    	//spinner
+		    	var minimumWordsSpinner = $( "#min-words-limit" ).spinner({ 
+		    		min: 0,
+		    		disabled: ($( "#min-words-limit" ).val() == 0)
+		    	});
+		    	$("#min-words-limit-checkbox").click(function() {
+		    		if ( minimumWordsSpinner.spinner( "option", "disabled" ) ) {
+		    			minimumWordsSpinner.spinner( "enable" );
+		    		} else {
+		    			minimumWordsSpinner.spinner( "disable" );
+		    		}
+		        });
 			});
+			
     		// post-submit callback 
     		function afterRatingSubmit(responseText, statusText)  { 
     			self.parent.refreshThickbox();
@@ -93,8 +122,7 @@
 				<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 id="question" value="${formBean.question}" contentFolderID="${formBean.contentFolderID}">
 				</lams:CKEditor>
 	
 				<div class="field-name space-top">
@@ -104,14 +132,38 @@
 				<html:text property="defaultGrade" styleClass="shortInputText"/>
 				
 				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired"/>
-					<fmt:message key="label.authoring.answer.required" />
+					<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" >
-					<html:checkbox property="allowRichEditor" />
-					<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
+					<html:checkbox property="allowRichEditor" styleId="allow-rich-editor"/>
+					<label for="allow-rich-editor">
+						<fmt:message key="label.authoring.basic.allow.learners.rich.editor" />
+					</label>
 				</div>
+				
+				<div class="field-name space-top" >
+					<input type="checkbox" id="max-words-limit-checkbox" name="noname"
+						<c:if test="${formBean.maxWordsLimit != 0}">checked="checked"</c:if>
+					/>
+					<label for="max-words-limit-checkbox" class="word-limit-label">
+						<fmt:message key="label.maximum.number.words" />
+					</label>
+					<html:text property="maxWordsLimit" styleId="max-words-limit"/>
+				</div>
+				
+				<div class="field-name space-top" >
+					<input type="checkbox" id="min-words-limit-checkbox" name="noname"
+						<c:if test="${formBean.minWordsLimit != 0}">checked="checked"</c:if>
+					/>
+					<label for="min-words-limit-checkbox" class="word-limit-label">
+						<fmt:message key="label.minimum.number.words" />
+					</label>
+					<html:text property="minWordsLimit" styleId="min-words-limit"/>
+				</div>
 					
 				<div class="field-name space-top">
 					<img src="<lams:LAMSURL/>/images/tree_closed.gif" onclick="javascript:toggleVisibility('general-feedback');" />
@@ -122,8 +174,7 @@
 				</div>
 				
 				<div id="general-feedback" class="hidden">
-					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}"
-						contentFolderID="${formBean.contentFolderID}">
+					<lams:CKEditor id="generalFeedback" value="${formBean.generalFeedback}" contentFolderID="${formBean.contentFolderID}">
 					</lams:CKEditor>
 				</div>
 
Index: lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp	(.../addmatchingpairs.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -140,8 +140,10 @@
 				<html:text property="penaltyFactor" styleClass="shortInputText" />
 				
 				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired"/>
-					<fmt:message key="label.authoring.answer.required" />
+					<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">
@@ -158,8 +160,10 @@
 				</div>			
 	
 				<div class="field-name space-top" >
-					<html:checkbox property="shuffle" />
-					<fmt:message key="label.authoring.basic.shuffle.the.choices" />
+					<html:checkbox property="shuffle" styleId="shuffle"/>
+					<label for="shuffle">
+						<fmt:message key="label.authoring.basic.shuffle.the.choices" />
+					</label>
 				</div>
 				
 				<input type="hidden" name="fake" id="fake">
Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp	(.../addmultiplechoice.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -160,8 +160,10 @@
 				<html:text property="penaltyFactor" styleClass="shortInputText" />
 				
 				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" />
-					<fmt:message key="label.authoring.answer.required" />
+					<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">
@@ -186,8 +188,10 @@
 				</html:select>
 	
 				<div class="field-name space-top" >
-					<html:checkbox property="shuffle" />
-					<fmt:message key="label.authoring.basic.shuffle.the.choices" />
+					<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">
Index: lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp	(.../addnumerical.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -204,8 +204,10 @@
 				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
 				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" />
-					<fmt:message key="label.authoring.answer.required" />
+					<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">
Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp	(.../addordering.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -145,8 +145,10 @@
 				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
 				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" />
-					<fmt:message key="label.authoring.answer.required" />
+					<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">
Index: lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/pages/authoring/parts/addshortanswer.jsp	(.../addshortanswer.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -152,8 +152,10 @@
 				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
 				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" />
-					<fmt:message key="label.authoring.answer.required" />
+					<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">
Index: lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp
===================================================================
diff -u -r5db1b4b04cb030113cfa1affe061817bcb4f2a21 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 5db1b4b04cb030113cfa1affe061817bcb4f2a21)
+++ lams_tool_assessment/web/pages/authoring/parts/addtruefalse.jsp	(.../addtruefalse.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -122,8 +122,10 @@
 				<html:text property="penaltyFactor" styleClass="shortInputText"/>
 				
 				<div class="field-name space-top" >
-					<html:checkbox property="answerRequired" />
-					<fmt:message key="label.authoring.answer.required" />
+					<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">
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r38b6d49113930570f68778048950c2df1875a6be -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 38b6d49113930570f68778048950c2df1875a6be)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -34,6 +34,7 @@
 	<c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
 	<c:set var="isLeadershipEnabled" value="${assessment.useSelectLeaderToolOuput}"/>
 	<c:set var="hasEditRight" value="${!isLeadershipEnabled || isLeadershipEnabled && isUserLeader}"/>
+	<c:set var="isEditingDisabled" value="${finishedLock || !hasEditRight}"/>
 	
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.countdown.css" />
 
@@ -98,7 +99,7 @@
 		</c:if>
 		
 		//autosave feature
-		<c:if test="${hasEditRight && !finishedLock && (mode != 'teacher')}">
+		<c:if test="${!isEditingDisabled && (mode != 'teacher')}">
 			var autosaveInterval = "30000"; // 30 seconds interval
 			window.setInterval(
 				function(){
@@ -128,9 +129,9 @@
 	        );
 		</c:if>
 		
-		//check if we came back due to missing required question's answer
+		//check if we came back due to failed answers' validation (missing required question's answer or min words limit not reached)
 		$(document).ready(function(){
-			if (${isRequiredAnswerMissed == true}) {
+			if (${isAnswersValidationFailed == true}) {
 				validateAnswers();
 			}
 		});
@@ -230,11 +231,13 @@
 		
 		function validateAnswers() {
 
-			if (${finishedLock || !hasEditRight}) {
+			if (${isEditingDisabled}) {
 				return true;
 			}
 			
 			var missingRequiredQuestions = [];
+			var minWordsLimitNotReachedQuestions = [];
+			var maxWordsLimitExceededQuestions = [];
 			
 			<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
 				<c:if test="${question.answerRequired}">
@@ -289,28 +292,83 @@
 						</c:when>
 					</c:choose>
 				</c:if>
+				
+				//essay question which has max words limit
+				<c:if test="${question.type == 6 && question.maxWordsLimit != 0}">
+					var wordCount${status.index} = $('#word-count${status.index}').text();
+					//max words limit is exceeded
+					if(wordCount${status.index} > ${question.maxWordsLimit}) {
+						maxWordsLimitExceededQuestions.push("${status.index}");
+					}
+				</c:if>
+				
+				//essay question which has min words limit
+				<c:if test="${question.type == 6 && question.minWordsLimit != 0}">
+					var wordCount${status.index} = $('#word-count${status.index}').text();
+					//min words limit is not reached
+					if(wordCount${status.index} < ${question.minWordsLimit}) {
+						minWordsLimitNotReachedQuestions.push("${status.index}");
+					}
+				</c:if>
 			</c:forEach>
 			
 			//return true in case all required questions were answered, false otherwise
-			if (missingRequiredQuestions.length == 0) {
+			if (missingRequiredQuestions.length == 0 && minWordsLimitNotReachedQuestions.length == 0 
+					&& maxWordsLimitExceededQuestions.length == 0) {
 				return true;
 				
 			} else {
 				//remove .warning-answer-required from all questions
 				$('[id^=question-area-]').removeClass('warning-answer-required');
+				$('#warning-answers-required').hide();
+				$('#warning-min-words-limit').hide();
+				$('#warning-max-words-limit').hide();
 				
-				//add .warning-answer-required class to those needs to be filled
-				for (i = 0; i < missingRequiredQuestions.length; i++) {
-				    $("#question-area-" + missingRequiredQuestions[i]).addClass('warning-answer-required');
+				if (missingRequiredQuestions.length != 0) {
+					//add .warning-answer-required class to those needs to be filled
+					for (i = 0; i < missingRequiredQuestions.length; i++) {
+					    $("#question-area-" + missingRequiredQuestions[i]).addClass('warning-answer-required');
+					}
+					//show alert message as well
+					$("#warning-answers-required").show();
+					
 				}
 				
-				//show alert message as well
-				$("#warning-answers-required").show();
+				if (maxWordsLimitExceededQuestions.length != 0) {
+					//add .warning-answer-required class to those needs to be filled
+					for (i = 0; i < maxWordsLimitExceededQuestions.length; i++) {
+					    $("#question-area-" + maxWordsLimitExceededQuestions[i]).addClass('warning-answer-required');
+					}
+					//show alert message as well
+					$("#warning-max-words-limit").show();		
+				}
+				
+				if (minWordsLimitNotReachedQuestions.length != 0) {
+					//add .warning-answer-required class to those needs to be filled
+					for (i = 0; i < minWordsLimitNotReachedQuestions.length; i++) {
+					    $("#question-area-" + minWordsLimitNotReachedQuestions[i]).addClass('warning-answer-required');
+					}
+					//show alert message as well
+					$("#warning-min-words-limit").show();		
+				}
+				
 				$("html, body").animate({ scrollTop: 0 }, "slow");//window.scrollTo(0, 0);
+				
 				return false;
 			}
 		}
-		
+
+		function getNumberOfWords(value, isRemoveHtmlTags) {
+			
+		    //HTML tags stripping 
+			if (isRemoveHtmlTags) {
+				value = value.replace(/&nbsp;/g, '').replace(/<\/?[a-z][^>]*>/gi, '');
+			}
+			value = value.trim();
+			
+		    var wordCount = value ? (value.replace(/['";:,.?\-!]+/g, '').match(/\S+/g) || []).length : 0;
+		    return wordCount;
+		}
     </script>
 </lams:head>
 <body class="stripes">
@@ -350,10 +408,18 @@
 			</p>
 		</c:if>
 		
-		<div class="info" id="warning-answers-required">
+		<div class="warning" id="warning-answers-required">
 			<fmt:message key="warn.answers.required" />
 		</div>
 		
+		<div class="warning" id="warning-max-words-limit">
+			<fmt:message key="warn.answers.exceed.max.words.limit" />
+		</div>
+	
+		<div class="warning" id="warning-min-words-limit">
+			<fmt:message key="warn.answers.doesnt.reach.min.words.limit" />
+		</div>
+		
 		<div id="question" style="display:none; cursor: default"> 
 	        <h1 style="padding: 30 10 50">
 	        	<fmt:message key='label.learning.blockui.are.you.ready' />
Index: lams_tool_assessment/web/pages/learning/parts/essay.jsp
===================================================================
diff -u -r1e33f64c06430834c80a2b01d42bcdf844c5d958 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision 1e33f64c06430834c80a2b01d42bcdf844c5d958)
+++ lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -1,25 +1,110 @@
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="isWordsLimitEnabled" value="${!isEditingDisabled && (question.maxWordsLimit != 0 || question.minWordsLimit != 0)}"/>
 
+<c:if test="${isWordsLimitEnabled}">
+<script type="text/javascript">
+	
+	$(document).ready(function() {
+		
+		//word count
+		var counter${status.index} = function() {
+			var isCkeditor = ${question.allowRichEditor};
+			
+			var value;
+			if (isCkeditor) {
+				//if (!CKEDITOR.instances.question${status.index}.checkDirty()) {
+				//	return;
+				//}
+			    value = CKEDITOR.instances.question${status.index}.getData();
+			    
+			} else {
+				value =  $("#question${status.index}__lamstextarea").val();
+			}
+		    
+			var wordCount = getNumberOfWords(value, isCkeditor);
+			$('#word-count${status.index}').html(wordCount);
+			
+		    var maxWordsLimit = ${question.maxWordsLimit};
+		    if(wordCount > maxWordsLimit){
+				//$('#text').val()  this.value = this.value.substring(0,limit);
+				//fix a bug: when change "this.value", onchange event won't be fired any more. So this will 
+				//manually handle onchange event. It is a kind of crack coding!
+				//filterData(document.getElementById('messageBody'),document.getElementById('message.body__lamshidden'));
+				//onchange="filterData(this,document.getElementById('question1__lamshidden'));"
+			}
+			//filterData(document.getElementById('question1__lamstextarea'),document.getElementById('question1__lamshidden'));
+		};
+		
+		if (${question.allowRichEditor}) {
+		    // @todo Make this more elegant (.on('change') once we upgrade to Ckeditor 4 
+		    CKEDITOR.instances["question${status.index}"].on('paste', counter${status.index});
+			CKEDITOR.instances["question${status.index}"].on('afterCommandExec', counter${status.index});
+			CKEDITOR.instances["question${status.index}"].on("instanceReady", function(){                    
+			     this.document.on("keyup", counter${status.index});
+			});
+			//count words initially
+		    CKEDITOR.instances["question${status.index}"].on('instanceReady', counter${status.index});
+		      
+		} else {
+			$("#question${status.index}__lamstextarea").on('change keydown keypress keyup paste', counter${status.index});
+			//count words initially
+			counter${status.index}();
+		}
+
+	});
+</script>
+</c:if>
+
 <div class="question-type">
 	<fmt:message key="label.learning.short.answer.answer" />
 </div>
 
 <table class="question-table">
+	<c:if test="${isWordsLimitEnabled}">
+		<tr>
+			<td class="reg-padding">
+				<c:if test="${question.maxWordsLimit != 0}">
+					<div class="info">
+						<fmt:message key="label.info.maximum.number.words" >
+							<fmt:param>${question.maxWordsLimit}</fmt:param>
+						</fmt:message>					
+					</div>
+				</c:if>
+				
+				<c:if test="${question.minWordsLimit != 0}">
+					<div class="info">
+						<fmt:message key="label.info.minimum.number.words" >
+							<fmt:param>${question.minWordsLimit}</fmt:param>
+						</fmt:message>					
+					</div>
+				</c:if>
+			</td>
+		</tr>
+	</c:if>
+
 	<tr>
 		<td class="reg-padding">
 			<c:choose>
-				<c:when test="${question.allowRichEditor && !finishedLock && hasEditRight}">
+				<c:when test="${question.allowRichEditor && !isEditingDisabled}">
 					<lams:CKEditor id="question${status.index}" value="${question.answerString}" contentFolderID="${sessionMap.learnerContentFolder}" toolbarSet="DefaultLearner"></lams:CKEditor>
 				</c:when>
 				<c:when test="${question.allowRichEditor && finishedLock}">
 					${question.answerString}
 				</c:when>				
 				<c:otherwise>
-					<lams:STRUTS-textarea property="question${status.index}" rows="7" cols="60" value="${question.answerString}" disabled="${finishedLock || !hasEditRight}" />
+					<lams:STRUTS-textarea property="question${status.index}" rows="7" cols="60" value="${question.answerString}" disabled="${isEditingDisabled}" />
 				</c:otherwise>
 			</c:choose>
 		</td>
 	</tr>
+	
+	<c:if test="${isWordsLimitEnabled}">
+		<tr>
+			<td class="reg-padding">
+				<fmt:message key="label.words" /> <span id="word-count${status.index}">0</span>
+			</td>
+		</tr>
+	</c:if>
 </table>
 
 <%@ include file="markandpenaltyarea.jsp"%>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
===================================================================
diff -u -r1e33f64c06430834c80a2b01d42bcdf844c5d958 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 1e33f64c06430834c80a2b01d42bcdf844c5d958)
+++ lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -23,7 +23,7 @@
 				<c:out value="${option.question}" escapeXml="false" />
 			</td>
 			<td class="question-option">
-				<html:select property="question${status.index}_${option.sequenceId}" value="${option.answerInt}" disabled="${finishedLock || !hasEditRight}">
+				<html:select property="question${status.index}_${option.sequenceId}" value="${option.answerInt}" disabled="${isEditingDisabled}">
 					<html:option value="-1"><fmt:message key="label.learning.matching.pairs.choose" /></html:option>
 					<c:forEach var="selectOption" items="${question.matchingPairOptions}">
 						<html:option value="${selectOption.uid}">${selectOption.optionString}</html:option>
Index: lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
===================================================================
diff -u -r3e771e28271a0ef14f3989fe84231546420df296 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 3e771e28271a0ef14f3989fe84231546420df296)
+++ lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -32,13 +32,13 @@
 					<c:when test="${question.multipleAnswersAllowed}">
 						<input type="checkbox" name="question${status.index}_${option.sequenceId}" value="${true}" styleClass="noBorder"
 	 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
-							<c:if test="${finishedLock || !hasEditRight}">disabled="disabled"</c:if>
+							<c:if test="${isEditingDisabled}">disabled="disabled"</c:if>
 						/>
 					</c:when>
 					<c:otherwise>
 						<input type="radio" name="question${status.index}" value="${option.sequenceId}" styleClass="noBorder"
 	 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
-	 						<c:if test="${finishedLock || !hasEditRight}">disabled="disabled"</c:if>
+	 						<c:if test="${isEditingDisabled}">disabled="disabled"</c:if>
 						/>
 					</c:otherwise>
 				</c:choose>
Index: lams_tool_assessment/web/pages/learning/parts/numerical.jsp
===================================================================
diff -u -r3e771e28271a0ef14f3989fe84231546420df296 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/learning/parts/numerical.jsp	(.../numerical.jsp)	(revision 3e771e28271a0ef14f3989fe84231546420df296)
+++ lams_tool_assessment/web/pages/learning/parts/numerical.jsp	(.../numerical.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -20,7 +20,7 @@
 		</c:if>		
 		<td class="reg-padding">
 			<input type="text" name="question${status.index}" value="<c:out value='${question.answerString}' />" styleClass="noBorder" size="70"
-				<c:if test="${finishedLock || !hasEditRight}">disabled="disabled"</c:if>
+				<c:if test="${isEditingDisabled}">disabled="disabled"</c:if>
 			/>	
 		</td>
 	</tr>
Index: lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
===================================================================
diff -u -r3e771e28271a0ef14f3989fe84231546420df296 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	(.../shortanswer.jsp)	(revision 3e771e28271a0ef14f3989fe84231546420df296)
+++ lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp	(.../shortanswer.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -20,7 +20,7 @@
 		</c:if>	
 		<td class="reg-padding">
 			<input type="text" name="question${status.index}" value="<c:out value='${question.answerString}' />" styleClass="noBorder" size="70"
-				<c:if test="${finishedLock || !hasEditRight}">disabled="disabled"</c:if>
+				<c:if test="${isEditingDisabled}">disabled="disabled"</c:if>
 			/>	
 		</td>
 	</tr>
Index: lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
===================================================================
diff -u -r3e771e28271a0ef14f3989fe84231546420df296 -r1668e000b0959071785e5cdd21732af39bd1505f
--- lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	(.../truefalse.jsp)	(revision 3e771e28271a0ef14f3989fe84231546420df296)
+++ lams_tool_assessment/web/pages/learning/parts/truefalse.jsp	(.../truefalse.jsp)	(revision 1668e000b0959071785e5cdd21732af39bd1505f)
@@ -29,7 +29,7 @@
 			<td class="has-radio-button">
 				<input type="radio" name="question${status.index}" value="${true}" styleClass="noBorder"
 	 				<c:if test="${question.answerBoolean}">checked="checked"</c:if>
-					<c:if test="${finishedLock || !hasEditRight}">disabled="disabled"</c:if>					 
+					<c:if test="${isEditingDisabled}">disabled="disabled"</c:if>					 
 				/>
 			</td>
 			<td class="question-option">
@@ -59,7 +59,7 @@
 			<td class="has-radio-button">
 				<input type="radio" name="question${status.index}" value="${false}" styleClass="noBorder"
 	 				<c:if test="${(!question.answerBoolean) and (question.answerString != null)}">checked="checked"</c:if>
-					<c:if test="${finishedLock || !hasEditRight}">disabled="disabled"</c:if>
+					<c:if test="${isEditingDisabled}">disabled="disabled"</c:if>
 				/>
 			</td>
 			<td class="question-option">