Index: lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r15d649f3833b2e6e5c89df3fdf8e12b4bde2b342
--- lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 15d649f3833b2e6e5c89df3fdf8e12b4bde2b342)
@@ -100,3 +100,17 @@
 outcome.authoring.existing.none = none
 outcome.authoring.remove.confirm = Are you sure you want to remove this learning outcome?
 outcome.authoring.create.new = [create new]
+label.authoring.advance.gallery.walk.enabled = Gallery Walk
+label.authoring.advance.gallery.walk.read.only = Disable commentary and rating
+label.authoring.advance.gallery.walk.info1 = Use Gallery Walk to promote inter- and intra-teams discussion, higher order thinking, cooperative learning and team building.
+label.authoring.advance.gallery.walk.info2 = When enabled, after you start Gallery Walk in the lesson, the document created for each team is shared to all other teams. Teams then, can give each others feedback and rate each others' work.
+label.authoring.advance.gallery.walk.instructions =  Instructions for Gallery Walk (ie: Please review other groups' work and make sure you add your review/comments)
+label.authoring.advance.gallery.walk.read.only.tooltip = Students will not be able to neither comment on nor rate other teams' work.
+label.gallery.walk.your.group = (Your group)
+label.gallery.walk.ratings.header = Ratings
+label.gallery.walk.wait.start = As part of this activity, the teacher has planned for you to view and maybe comment on the work of other teams. The activity of seeing and commenting on others' work is called Gallery Walk. Please wait for the teacher to start the Gallery Walk. If this is taking too long, please contact the teacher for assistance.
+label.gallery.walk.wait.start.preview = Continue to Gallery Walk. Since you are in preview mode, you can do it immediately. Regular learners get this message would need to wait for a teacher to start Gallery Walk on monitoring screen.
+label.gallery.walk.wait.finish.preview = Continue to Gallery Walk summary. Since you are in preview mode, you can do it immediately. Regular learners get this message would need to wait for a teacher to finish Gallery Walk on monitoring screen.
+label.gallery.walk.preview = You are in preview mode. You only see your own group. Regular learners would see other groups' work and would be able to comment on it and rate it.
+label.gallery.walk = Gallery Walk
+label.gallery.walk.wait.finish = The Gallery Walk activity has not been set as completed by the teacher. If you have completed, please contact the teacher for assistance.
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java
===================================================================
diff -u -r845b503553ad948cb5db7b89950f7c5251ada5d7 -r15d649f3833b2e6e5c89df3fdf8e12b4bde2b342
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 845b503553ad948cb5db7b89950f7c5251ada5d7)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 15d649f3833b2e6e5c89df3fdf8e12b4bde2b342)
@@ -72,7 +72,7 @@
 
     @Autowired
     private IMindmapService mindmapService;
-    
+
     @Autowired
     @Qualifier("mindmapMessageService")
     private MessageService messageService;
@@ -109,7 +109,7 @@
 
 	return readDatabaseData(authoringForm, mindmap, request, mode);
     }
-    
+
     /**
      * Set the defineLater flag so that learners cannot use content while we are editing. This flag is released when
      * updateContent is called.
@@ -256,6 +256,9 @@
 	mindmap.setInstructions(authoringForm.getInstructions());
 	mindmap.setLockOnFinished(authoringForm.isLockOnFinished());
 	mindmap.setMultiUserMode(authoringForm.isMultiUserMode());
+	mindmap.setGalleryWalkEnabled(authoringForm.isGalleryWalkEnabled());
+	mindmap.setGalleryWalkReadOnly(authoringForm.isGalleryWalkReadOnly());
+	mindmap.setGalleryWalkInstructions(authoringForm.getGalleryWalkInstructions());
 	// reflection
 	mindmap.setReflectOnActivity(authoringForm.isReflectOnActivity());
 	mindmap.setReflectInstructions(authoringForm.getReflectInstructions());
@@ -269,6 +272,9 @@
 	authoringForm.setInstructions(mindmap.getInstructions());
 	authoringForm.setLockOnFinished(mindmap.isLockOnFinished());
 	authoringForm.setMultiUserMode(mindmap.isMultiUserMode());
+	authoringForm.setGalleryWalkEnabled(mindmap.isGalleryWalkEnabled());
+	authoringForm.setGalleryWalkReadOnly(mindmap.isGalleryWalkReadOnly());
+	authoringForm.setGalleryWalkInstructions(mindmap.getGalleryWalkInstructions());
 	// reflection
 	authoringForm.setReflectOnActivity(mindmap.isReflectOnActivity());
 	authoringForm.setReflectInstructions(mindmap.getReflectInstructions());
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java
===================================================================
diff -u -r21ffaba743a8aeb994ba62e03e2a82ae13344f9b -r15d649f3833b2e6e5c89df3fdf8e12b4bde2b342
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 21ffaba743a8aeb994ba62e03e2a82ae13344f9b)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision 15d649f3833b2e6e5c89df3fdf8e12b4bde2b342)
@@ -23,29 +23,23 @@
 
 package org.lamsfoundation.lams.tool.mindmap.web.forms;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.util.SessionMap;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 
-/**
- *
- */
 public class AuthoringForm {
 
-    private static final long serialVersionUID = 3950453134542135495L;
+    private String title;
+    private String instructions;
+    private boolean lockOnFinished;
+    private boolean multiUserMode;
+    private boolean galleryWalkEnabled;
+    private boolean galleryWalkReadOnly;
+    private String galleryWalkInstructions;
+    private String currentTab;
+    private String dispatch;
+    private String sessionMapID;
+    private SessionMap sessionMap;
+    private String mindmapContent;
 
-    String title;
-    String instructions;
-    boolean lockOnFinished;
-    boolean multiUserMode;
-    String currentTab;
-    String dispatch;
-    String sessionMapID;
-    SessionMap sessionMap;
-    String mindmapContent;
     // reflection
     private boolean reflectOnActivity;
     private String reflectInstructions;
@@ -114,6 +108,30 @@
 	this.multiUserMode = multiUserMode;
     }
 
+    public boolean isGalleryWalkEnabled() {
+	return galleryWalkEnabled;
+    }
+
+    public void setGalleryWalkEnabled(boolean galleryWalkEnabled) {
+	this.galleryWalkEnabled = galleryWalkEnabled;
+    }
+
+    public boolean isGalleryWalkReadOnly() {
+	return galleryWalkReadOnly;
+    }
+
+    public void setGalleryWalkReadOnly(boolean galleryWalkReadOnly) {
+	this.galleryWalkReadOnly = galleryWalkReadOnly;
+    }
+
+    public String getGalleryWalkInstructions() {
+	return galleryWalkInstructions;
+    }
+
+    public void setGalleryWalkInstructions(String galleryWalkInstructions) {
+	this.galleryWalkInstructions = galleryWalkInstructions;
+    }
+
     public String getMindmapContent() {
 	return mindmapContent;
     }
Index: lams_tool_mindmap/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r15d649f3833b2e6e5c89df3fdf8e12b4bde2b342
--- lams_tool_mindmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_mindmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 15d649f3833b2e6e5c89df3fdf8e12b4bde2b342)
@@ -1,7 +1,49 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <!-- ========== Advanced Tab ========== -->
+<script>			
+	// avoid name clash between bootstrap and jQuery UI
+	$.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
+	
+	$(document).ready(function() {
+		//automatically turn on refect option if there are text input in refect instruction area
+		var ra = document.getElementById("reflect-instructions");
+		var rao = document.getElementById("reflect-on");
 
+		function turnOnRefect() {
+			if(isEmpty(ra.value)) {
+			//turn off	
+				rao.checked = false;
+			} else {
+			//turn on
+				rao.checked = true;
+			}
+		}
+
+		ra.onkeyup = turnOnRefect;
+		
+		$('#gallery-walk-enabled').change(function(){
+			if ($(this).is(':checked')) {
+				$('#gallery-walk-options').slideDown();
+			} else {
+				$('#gallery-walk-options').slideUp()
+					.find('#gallery-walk-read-only').prop('checked', false);
+			}
+		}).change();
+
+		$('#multiUserMode').change(function(){
+			if ($(this).is(':checked')) {
+				$('#gallery-walk-enabled, #gallery-walk-read-only').prop('disabled', false);
+			} else {
+				$('#gallery-walk-enabled, #gallery-walk-read-only').prop('checked', false).prop('disabled', true);
+				$('#gallery-walk-options').slideUp();
+			}
+		}).change();
+		
+		$('[data-toggle="tooltip"]').bootstrapTooltip();
+	});
+</script>
+
 <lams:SimplePanel titleKey="label.mindmap.options">
 
 	<div class="checkbox">
@@ -13,6 +55,40 @@
 	
 </lams:SimplePanel>
 
+<lams:SimplePanel titleKey="label.gallery.walk">
+	<p>
+		<fmt:message key="label.authoring.advance.gallery.walk.info1" />
+	</p>
+	<p>
+		<fmt:message key="label.authoring.advance.gallery.walk.info2" />
+	</p>
+	
+	<div class="checkbox">
+		<label for="gallery-walk-enabled">
+			<form:checkbox path="galleryWalkEnabled" id="gallery-walk-enabled" />
+			<fmt:message key="label.authoring.advance.gallery.walk.enabled" />
+		</label>
+	</div>
+	
+	<div id="gallery-walk-options" class="loffset10">
+		<div class="checkbox">
+			<label for="gallery-walk-read-only">
+				<form:checkbox path="galleryWalkReadOnly" id="gallery-walk-read-only" />
+				<fmt:message key="label.authoring.advance.gallery.walk.read.only" />
+			</label>
+			<i class="fa fa-question-circle" 
+			   data-toggle="tooltip" title="<fmt:message key='label.authoring.advance.gallery.walk.read.only.tooltip' />"></i>
+		</div>
+		
+		<div class="form-group">
+			<fmt:message key='label.authoring.advance.gallery.walk.instructions' var="galleryWalkInstructions"/>
+			<form:textarea path="galleryWalkInstructions" cssClass="form-control" rows="3" 
+						   placeholder="${galleryWalkInstructions}" />
+		</div>
+		
+	</div>
+</lams:SimplePanel>
+
 <lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
 
 <lams:SimplePanel titleKey="label.activity.completion">
@@ -36,22 +112,4 @@
 		<textarea name="reflectInstructions" cols="60" rows="3" id="reflect-instructions" class="form-control">${authoringForm.reflectInstructions}</textarea>
 	</div>
 
-</lams:SimplePanel>
-
-<script type="text/javascript">
-//automatically turn on refect option if there are text input in refect instruction area
-	var ra = document.getElementById("reflect-instructions");
-	var rao = document.getElementById("reflect-on");
-
-	function turnOnRefect() {
-		if(isEmpty(ra.value)) {
-		//turn off	
-			rao.checked = false;
-		} else {
-		//turn on
-			rao.checked = true;
-		}
-	}
-
-	ra.onkeyup = turnOnRefect;
-</script>
\ No newline at end of file
+</lams:SimplePanel>
\ No newline at end of file