Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Attic/Scratchie.hbm.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	20 Jul 2016 14:33:47 -0000	1.1.2.2
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml	23 Feb 2017 10:19:56 -0000	1.1.2.3
@@ -135,6 +135,14 @@
             column="burning_questions_enabled"
         />
         
+       <property
+            name="shuffleItems"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="shuffle_items"
+        />
+        
         <property
             name="timeLimit"
             type="int"
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.27.2.10 -r1.27.2.11
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	13 Dec 2016 00:26:42 -0000	1.27.2.10
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	23 Feb 2017 10:19:56 -0000	1.27.2.11
@@ -201,5 +201,6 @@
 label.waiting.for.leader.submit.notebook  =Time limit set by teacher is expired. Please wait until a group leader submits notebook.
 label.waiting.for.leader.submit.burning.questions  =Time limit set by teacher is expired. Please wait until a group leader submits burning questions.
 
+label.authoring.advanced.shuffle.items  =Shuffle items
 
 #======= End labels: Exported 194 labels for en AU =====
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170221.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java,v
diff -u -r1.9.2.5 -r1.9.2.6
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	20 Jul 2016 14:33:47 -0000	1.9.2.5
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	23 Feb 2017 10:19:56 -0000	1.9.2.6
@@ -69,6 +69,8 @@
 
     private boolean burningQuestionsEnabled;
     
+    private boolean shuffleItems;
+    
     private int timeLimit;
 
     private boolean reflectOnActivity;
@@ -345,6 +347,18 @@
     }
     
     /**
+    *
+    * @return
+    */
+   public boolean isShuffleItems() {
+	return shuffleItems;
+   }
+
+   public void setShuffleItems(boolean shuffleItems) {
+	this.shuffleItems = shuffleItems;
+   }
+    
+    /**
      * @return Returns the time limitation, that students have to complete an attempt.
      */
     public int getTimeLimit() {
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.44.2.19 -r1.44.2.20
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	6 Dec 2016 16:52:34 -0000	1.44.2.19
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	23 Feb 2017 10:19:56 -0000	1.44.2.20
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -251,6 +252,14 @@
 
 	// set scratched flag for display purpose
 	Collection<ScratchieItem> items = service.getItemsWithIndicatedScratches(toolSessionId);
+	
+	// shuffling items
+	if (scratchie.isShuffleItems()) {
+	    //items is a Set at this moment
+	    ArrayList<ScratchieItem> shuffledItems = new ArrayList<ScratchieItem>(items);
+	    Collections.shuffle(shuffledItems);
+	    items = shuffledItems;
+	}
 
 	// for teacher in monitoring display the number of attempt.
 	if (mode.isTeacher()) {
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/authoring/advance.jsp,v
diff -u -r1.6.2.4 -r1.6.2.5
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	20 Jul 2016 14:33:47 -0000	1.6.2.4
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	23 Feb 2017 10:19:56 -0000	1.6.2.5
@@ -16,12 +16,19 @@
 	</c:if>
 	
 	<div class="checkbox">
-		<label for="burningQuestionsEnabled">
-			<html:checkbox property="scratchie.burningQuestionsEnabled" styleId="burningQuestionsEnabled"/>
+		<label for="burning-questions-enabled">
+			<html:checkbox property="scratchie.burningQuestionsEnabled" styleId="burning-questions-enabled"/>
 			<fmt:message key="label.authoring.advanced.burning.questions" />
 		</label>
 	</div>
 	
+	<div class="checkbox">
+		<label for="shuffle-items">
+			<html:checkbox property="scratchie.shuffleItems" styleId="shuffle-items"/>
+			<fmt:message key="label.authoring.advanced.shuffle.items" />
+		</label>
+	</div>
+	
 	<div class="form-inline">
 		<label for="time-limit">
 			<fmt:message key="label.time.limit" />&nbsp;
@@ -44,8 +51,7 @@
 </lams:SimplePanel>
 
 <script type="text/javascript">
-<!--
-//automatically turn on refect option if there are text input in refect instruction area
+	//automatically turn on refect option if there are text input in refect instruction area
 	var ra = document.getElementById("reflectInstructions");
 	var rao = document.getElementById("reflectOn");
 	function turnOnRefect(){
@@ -57,7 +63,18 @@
 			rao.checked = true;		
 		}
 	}
-
 	ra.onkeyup=turnOnRefect;
-//-->
+	
+	//disable #shuffle-items when burning questions option is ON
+	$("#burning-questions-enabled").click(function() {
+		var isBurningQuestionsOn = $("#burning-questions-enabled").is(":checked");
+	
+		$("#shuffle-items").prop("disabled", isBurningQuestionsOn);
+		if (isBurningQuestionsOn) {
+			$("#shuffle-items").prop("checked", false);
+		}
+	});
+	
+	<c:if test="${formBean.scratchie.burningQuestionsEnabled}">$("#shuffle-items").prop("disabled", true);</c:if>
+	
 </script>
Index: lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp,v
diff -u -r1.5.2.3 -r1.5.2.4
--- lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	20 Jul 2016 14:33:47 -0000	1.5.2.3
+++ lams_tool_scratchie/web/pages/monitoring/parts/advanceOptions.jsp	23 Feb 2017 10:19:56 -0000	1.5.2.4
@@ -40,6 +40,23 @@
 	
 	<tr>
 		<td>
+			<fmt:message key="label.authoring.advanced.shuffle.items" />
+		</td>
+		
+		<td>
+			<c:choose>
+				<c:when test="${sessionMap.scratchie.shuffleItems}">
+					<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.time.limit" />
 		</td>