Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6d5051e601d8b22df0e8c513e28e7b095d85fabe -rb6338c5ec82064b16083ee6c6ca28da14a245fd6
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6d5051e601d8b22df0e8c513e28e7b095d85fabe)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b6338c5ec82064b16083ee6c6ca28da14a245fd6)
@@ -96,4 +96,6 @@
 outcome.authoring.create.new = [create new]
 output.desc.manual.grading = Manual grading
 monitoring.summary.gallery.walk.start = Start Gallery Walk
-monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk?
\ No newline at end of file
+monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk?
+monitoring.summary.gallery.walk.finish = Finish Gallery Walk
+monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk?
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -re606aaebe2ef85c40a4054ef76abf62c94d224a4 -rb6338c5ec82064b16083ee6c6ca28da14a245fd6
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision e606aaebe2ef85c40a4054ef76abf62c94d224a4)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision b6338c5ec82064b16083ee6c6ca28da14a245fd6)
@@ -516,10 +516,24 @@
 	}
 	dokumaran.setGalleryWalkStarted(true);
 	dokumaranDao.saveObject(dokumaran);
-	
+
 	LearningWebsocketServer.sendPageRefreshRequest(toolContentId);
     }
 
+    @Override
+    public void finishGalleryWalk(long toolContentId) throws IOException {
+	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
+	if (!dokumaran.isGalleryWalkEnabled()) {
+	    throw new IllegalArgumentException(
+		    "Can not finish Gallery Walk as it is not enabled for Dokumaran with tool content ID "
+			    + toolContentId);
+	}
+	dokumaran.setGalleryWalkFinished(true);
+	dokumaranDao.saveObject(dokumaran);
+
+	LearningWebsocketServer.sendPageRefreshRequest(toolContentId);
+    }
+
     // *****************************************************************************
     // private methods
     // *****************************************************************************
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
===================================================================
diff -u -re606aaebe2ef85c40a4054ef76abf62c94d224a4 -rb6338c5ec82064b16083ee6c6ca28da14a245fd6
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision e606aaebe2ef85c40a4054ef76abf62c94d224a4)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(.../IDokumaranService.java)	(revision b6338c5ec82064b16083ee6c6ca28da14a245fd6)
@@ -264,4 +264,6 @@
     DokumaranUser getUser(Long uid);
 
     void startGalleryWalk(long toolContentId) throws IOException;
-}
+
+    void finishGalleryWalk(long toolContentId) throws IOException;
+}
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
===================================================================
diff -u -re606aaebe2ef85c40a4054ef76abf62c94d224a4 -rb6338c5ec82064b16083ee6c6ca28da14a245fd6
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(.../LearningController.java)	(revision e606aaebe2ef85c40a4054ef76abf62c94d224a4)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java	(.../LearningController.java)	(revision b6338c5ec82064b16083ee6c6ca28da14a245fd6)
@@ -166,7 +166,7 @@
 	}
 	request.setAttribute(DokumaranConstants.KEY_ETHERPAD_SERVER_URL, etherpadServerUrl);
 
-	if (dokumaran.isGalleryWalkStarted() && !dokumaran.isGalleryWalkFinished()) {
+	if (dokumaran.isGalleryWalkStarted()) {
 	    List<SessionDTO> groupList = dokumaranService.getSummary(dokumaran.getContentId());
 	    request.setAttribute(DokumaranConstants.ATTR_SUMMARY_LIST, groupList);
 	    if (currentUserDto == null) {
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
===================================================================
diff -u -re606aaebe2ef85c40a4054ef76abf62c94d224a4 -rb6338c5ec82064b16083ee6c6ca28da14a245fd6
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e606aaebe2ef85c40a4054ef76abf62c94d224a4)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision b6338c5ec82064b16083ee6c6ca28da14a245fd6)
@@ -282,7 +282,14 @@
 
 	dokumaranService.startGalleryWalk(toolContentId);
     }
+    
+    @RequestMapping("/finishGalleryWalk")
+    private void finishGalleryWalk(HttpServletRequest request) throws IOException {
+	Long toolContentId = WebUtil.readLongParam(request, DokumaranConstants.ATTR_TOOL_CONTENT_ID, false);
 
+	dokumaranService.finishGalleryWalk(toolContentId);
+    }
+
     private Integer getUserId() {
 	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -r1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7 -rb6338c5ec82064b16083ee6c6ca28da14a245fd6
--- lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7)
+++ lams_tool_doku/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision b6338c5ec82064b16083ee6c6ca28da14a245fd6)
@@ -28,6 +28,16 @@
 				}
 			});
 		});
+		
+		function finishSession(){
+			document.getElementById("finish-button").disabled = true;
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}"/>';
+			return false;
+		}
+		
+		function continueReflect(){
+			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
+		}
 	</script>
 	
 	<%@ include file="websocket.jsp"%>	
@@ -62,6 +72,34 @@
 			</div>
 		</c:forEach>
 	</div>
+	
+	<c:if test="${mode != 'teacher' and dokumaran.galleryWalkFinished}">
+		<div>
+			<c:choose>
+				<c:when test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+					<button name="FinishButton" id="finish-button"
+							onclick="return continueReflect()" class="btn btn-default voffset5 pull-right">
+						<fmt:message key="label.continue" />
+					</button>
+				</c:when>
+				<c:otherwise>
+					<a href="#nogo" name="FinishButton" id="finish-button"
+							onclick="return finishSession()" class="btn btn-primary voffset5 pull-right na">
+						<span class="nextActivity">
+							<c:choose>
+			 					<c:when test="${sessionMap.isLastActivity}">
+			 						<fmt:message key="label.submit" />
+			 					</c:when>
+			 					<c:otherwise>
+			 		 				<fmt:message key="label.finished" />
+			 					</c:otherwise>
+			 				</c:choose>
+						</span>
+					</a>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
 </lams:Page>
 </body>
 </lams:html>
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r6d5051e601d8b22df0e8c513e28e7b095d85fabe -rb6338c5ec82064b16083ee6c6ca28da14a245fd6
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 6d5051e601d8b22df0e8c513e28e7b095d85fabe)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision b6338c5ec82064b16083ee6c6ca28da14a245fd6)
@@ -352,9 +352,26 @@
 			},
 			'success' : function(){
 				$('#gallery-walk-start').hide();
+				$('#gallery-walk-finish').hide();
 			}
 		});
 	}
+	
+	function finishGalleryWalk(){
+		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.finish.confirm" />')) {
+			return;
+		}
+		
+		$.ajax({
+			'url' : '<c:url value="/monitoring/finishGalleryWalk.do"/>',
+			'data': {
+				toolContentID : ${dokumaran.contentId}
+			},
+			'success' : function(){
+				$('#gallery-walk-finish').hide();
+			}
+		});
+	}
 </script>
 
 <div class="panel">
@@ -396,10 +413,17 @@
 			<c:if test="${dokumaran.galleryWalkEnabled}">
 				<button id="gallery-walk-start" type="button"
 				        class="btn btn-default 
-				        	   ${dokumaran.galleryWalkEnabled and not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'hidden'}"
+				        	   ${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'hidden'}"
 				        onClick="javascript:startGalleryWalk()">
 					<fmt:message key="monitoring.summary.gallery.walk.start" /> 
 				</button>
+				
+				<button id="gallery-walk-finish" type="button"
+				        class="btn btn-default 
+				        	   ${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'hidden'}"
+				        onClick="javascript:finishGalleryWalk()">
+					<fmt:message key="monitoring.summary.gallery.walk.finish" /> 
+				</button>
 			</c:if>
 		</div>