Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -reb66c6552f1e9a4522f1c741c29c31be317523e5 -rd89dfbd4b29efec465fba9bb517dea1d173c3844
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eb66c6552f1e9a4522f1c741c29c31be317523e5)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision d89dfbd4b29efec465fba9bb517dea1d173c3844)
@@ -280,6 +280,7 @@
 label.continue  =Continue
 label.edit  =Edit
 lams.submit  =Finished
+label.authoring.advance.numbered.questions  =Enable questions' numbering
 
 
 #======= End labels: Exported 274 labels for en AU =====
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130611.sql
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130611.sql	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130611.sql	(revision d89dfbd4b29efec465fba9bb517dea1d173c3844)
@@ -0,0 +1,15 @@
+-- SQL statements to update to LAMS 2.3.6
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3048 Make question numbering optional
+ALTER TABLE tl_laasse10_assessment ADD COLUMN numbered tinyint DEFAULT true;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 -rd89dfbd4b29efec465fba9bb517dea1d173c3844
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision d89dfbd4b29efec465fba9bb517dea1d173c3844)
@@ -72,6 +72,8 @@
     private boolean runOffline;
 
     private boolean shuffled;
+    
+    private boolean numbered;
 
     private boolean allowQuestionFeedback;
 
@@ -722,7 +724,21 @@
     public void setShuffled(boolean shuffled) {
 	this.shuffled = shuffled;
     }
+    
+    /**
+     * If this is checked, then in learner we display the numbering for learners.
+     * 
+     * @hibernate.property column="numbered"
+     * @return
+     */
+    public boolean isNumbered() {
+	return numbered;
+    }
 
+    public void setNumbered(boolean numbered) {
+	this.numbered = numbered;
+    }
+
     public List<AssessmentAttachment> getOfflineFileList() {
 	return offlineFileList;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
===================================================================
diff -u -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 -rd89dfbd4b29efec465fba9bb517dea1d173c3844
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(.../AssessmentForm.java)	(revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(.../AssessmentForm.java)	(revision d89dfbd4b29efec465fba9bb517dea1d173c3844)
@@ -80,6 +80,7 @@
 	    assessment.setAllowWrongAnswersAfterQuestion(false);
 	    assessment.setDefineLater(false);
 	    assessment.setShuffled(false);
+	    assessment.setNumbered(false);
 	    assessment.setRunOffline(false);
 	    assessment.setDisplaySummary(false);
 	    assessment.setReflectOnActivity(false);
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r3e264b3972f0380c34b3259d0cb9a1f251435ef4 -rd89dfbd4b29efec465fba9bb517dea1d173c3844
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 3e264b3972f0380c34b3259d0cb9a1f251435ef4)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision d89dfbd4b29efec465fba9bb517dea1d173c3844)
@@ -62,6 +62,13 @@
 </p>
 
 <p>
+	<html:checkbox property="assessment.numbered" styleClass="noBorder" styleId="shuffled"/>
+	<label for="shuffled">
+		<fmt:message key="label.authoring.advance.numbered.questions" />
+	</label>
+</p>
+
+<p>
 	<label>
 		<fmt:message key="label.authoring.advance.choose.restriction" />
 	</label>
Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
===================================================================
diff -u -r0c7332f878ff51630f2c84a47f419abc832e022e -rd89dfbd4b29efec465fba9bb517dea1d173c3844
--- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision 0c7332f878ff51630f2c84a47f419abc832e022e)
+++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp	(.../allquestions.jsp)	(revision d89dfbd4b29efec465fba9bb517dea1d173c3844)
@@ -1,11 +1,14 @@
-<%@ include file="/common/taglibs.jsp"%>		
+<%@ include file="/common/taglibs.jsp"%>
 		<form id="answers" name="answers" method="post" >
 			<table cellspacing="0" class="alternative-color">
 				<c:forEach var="question" items="${sessionMap.pagedQuestions[pageNumber-1]}" varStatus="status">
 					<tr>
-						<td style="padding: 15px 15px 15px; width: 10px; font-weight: bold;" >
-							${status.index + sessionMap.questionNumberingOffset} 
-						</td>
+						<c:if test="${assessment.numbered}">
+							<td style="padding: 15px 15px 15px; width: 10px; font-weight: bold;" >
+								${status.index + sessionMap.questionNumberingOffset} 
+							</td>
+						</c:if>
+						
 						<td style="padding-left: 0px;">
 							<input type="hidden" name="questionUid${status.index}" id="questionUid${status.index}" value="${question.uid}" />						
 							
Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
diff -u -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 -rd89dfbd4b29efec465fba9bb517dea1d173c3844
--- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4)
+++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(.../advanceoptions.jsp)	(revision d89dfbd4b29efec465fba9bb517dea1d173c3844)
@@ -26,7 +26,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.shuffled == true}">
+				<c:when test="${assessment.shuffled}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -38,6 +38,23 @@
 	
 	<tr>
 		<td>
+			<fmt:message key="label.authoring.advance.numbered.questions" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${assessment.numbered}">
+					<fmt:message key="label.on" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.off" />
+				</c:otherwise>
+			</c:choose>	
+		</td>
+	</tr>
+	
+	<tr>
+		<td>
 			<fmt:message key="label.authoring.advance.attempts.allowed" />
 		</td>
 		
@@ -77,7 +94,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.allowOverallFeedbackAfterQuestion == true}">
+				<c:when test="${assessment.allowOverallFeedbackAfterQuestion}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -94,7 +111,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.allowQuestionFeedback == true}">
+				<c:when test="${assessment.allowQuestionFeedback}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -111,7 +128,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.allowRightAnswersAfterQuestion == true}">
+				<c:when test="${assessment.allowRightAnswersAfterQuestion}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -127,7 +144,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.allowWrongAnswersAfterQuestion == true}">
+				<c:when test="${assessment.allowWrongAnswersAfterQuestion}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -143,7 +160,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.allowGradesAfterAttempt == true}">
+				<c:when test="${assessment.allowGradesAfterAttempt}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -159,7 +176,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.allowHistoryResponses == true}">
+				<c:when test="${assessment.allowHistoryResponses}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -175,7 +192,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.notifyTeachersOnAttemptCompletion == true}">
+				<c:when test="${assessment.notifyTeachersOnAttemptCompletion}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -192,7 +209,7 @@
 		
 		<td>
 			<c:choose>
-				<c:when test="${assessment.reflectOnActivity == true}">
+				<c:when test="${assessment.reflectOnActivity}">
 					<fmt:message key="label.on" />
 				</c:when>
 				<c:otherwise>
@@ -203,7 +220,7 @@
 	</tr>
 	
 	<c:choose>
-		<c:when test="${assessment.reflectOnActivity == true}">
+		<c:when test="${assessment.reflectOnActivity}">
 			<tr>
 				<td>
 					<fmt:message key="monitor.summary.td.notebookInstructions" />