Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171117.sql
===================================================================
diff -u -r00c630a99ddb827c772bd0fc0d8d903cc0079f7e -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171117.sql	(.../patch20171117.sql)	(revision 00c630a99ddb827c772bd0fc0d8d903cc0079f7e)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171117.sql	(.../patch20171117.sql)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -9,6 +9,8 @@
 	   poll_id BIGINT(20) NOT NULL AUTO_INCREMENT
      , kumalive_id BIGINT(20) NOT NULL
      , name VARCHAR(250)
+     , votes_released TINYINT(1) DEFAULT 0
+     , voters_released TINYINT(1) DEFAULT 0
      , start_date DATETIME NOT NULL
      , finish_date DATETIME
      , PRIMARY KEY (poll_id)
Index: lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml
===================================================================
diff -u -redcf26c6dbd1e4ff36858d876e908774abb7910d -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml	(.../KumalivePoll.hbm.xml)	(revision edcf26c6dbd1e4ff36858d876e908774abb7910d)
+++ lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml	(.../KumalivePoll.hbm.xml)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -13,6 +13,20 @@
 
 		<property name="name" type="java.lang.String" column="name" length="250" />
 		
+		<property
+            name="votesReleased"
+            type="java.lang.Boolean"
+            column="votes_released"
+            not-null="false"
+        />
+        
+		<property
+            name="votersReleased"
+            type="java.lang.Boolean"
+            column="voters_released"
+            not-null="false"
+        />
+        
         <property
             name="startDate"
             type="java.util.Date"
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra6756ff12e2b1eaa3c06a2456c87daea872397f2 -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a6756ff12e2b1eaa3c06a2456c87daea872397f2)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -126,7 +126,7 @@
 label.kumalive.name.enter  =Enter a name for a new Kumalive
 button.kumalive.create  =Create
 button.kumalive.finish.kumalive  =Finish Kumalive
-button.kumalive.ask  =Ask a question
+button.kumalive.ask =Ask question
 button.kumalive.finish.question  =Finish question
 button.kumalive.raise  =Raise hand
 button.kumalive.putdown  =Put hand down
@@ -158,6 +158,7 @@
 button.kumalive.report.export.all  =Export all
 button.kumalive.report.export.selected  =Export selected
 button.kumalive.poll =Poll
+button.kumalive.poll.create =Create poll
 label.kumalive.poll.question =Question (optional)
 label.kumalive.poll.question.tip =for example: Why is the sky blue?
 label.kumalive.poll.answer =Answers
@@ -173,8 +174,12 @@
 label.kumalive.poll.answer.custom.error.count =Maximum 10 answers allowed
 button.kumalive.poll.start =Ask now!
 button.kumalive.poll.vote =Vote
-button.kumalive.poll.finish =Finish
-message.kumalive.poll.finish.confirm =Are you sure you want to finish this poll?
-button.kumalive.poll.close =Close
+button.kumalive.poll.finish =Finish poll
+message.kumalive.poll.finish.confirm =Are you sure you want to finish this poll and prevent learners from voting?
+button.kumalive.poll.close =Close poll
+button.kumalive.poll.release.votes =Show votes to learners
+message.kumalive.poll.release.votes.confirm =Are you sure you want to show poll results to students who voted?
+button.kumalive.poll.release.voters =Show votes & voters to learners
+message.kumalive.poll.release.voters.confirm =Are you sure you want to show poll results and voters' names to students?
 
 #======= End labels: Exported 151 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r0b8d119797d69e0add835267e618765b5c1dc069 -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 0b8d119797d69e0add835267e618765b5c1dc069)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -126,7 +126,7 @@
 label.kumalive.name.enter  =Enter a name for a new Kumalive
 button.kumalive.create  =Create
 button.kumalive.finish.kumalive  =Finish Kumalive
-button.kumalive.ask  =Ask a question
+button.kumalive.ask  =Ask question
 button.kumalive.finish.question  =Finish question
 button.kumalive.raise  =Raise hand
 button.kumalive.putdown  =Put hand down
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
===================================================================
diff -u -r00c630a99ddb827c772bd0fc0d8d903cc0079f7e -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java	(.../KumaliveWebsocketServer.java)	(revision 00c630a99ddb827c772bd0fc0d8d903cc0079f7e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java	(.../KumaliveWebsocketServer.java)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -98,8 +98,8 @@
 	private final ArrayList<List<UserDTO>> voters = new ArrayList<List<UserDTO>>();
 	private final JSONArray votersJSON = new JSONArray();
 	private boolean finished = false;
-	private boolean votesShown = false;
-	private boolean votersShown = false;
+	private boolean votesReleased = false;
+	private boolean votersReleased = false;
 
 	private KumalivePollDTO(Long pollId) {
 	    this.pollId = pollId;
@@ -211,6 +211,9 @@
 	    case "votePoll":
 		votePoll(requestJSON, session);
 		break;
+	    case "releasePollResults":
+		releasePollResults(requestJSON, session);
+		break;
 	    case "finishPoll":
 		finishPoll(requestJSON, session);
 		break;
@@ -408,10 +411,10 @@
 		boolean voted = participant.vote != null && kumalive.poll.pollId != null
 			&& participant.vote.pollId.equals(kumalive.poll.pollId);
 		// put them in response only if teacher released them and user voted
-		if (!kumalive.poll.votesShown || (!voted && !kumalive.poll.finished)) {
+		if (!kumalive.poll.votesReleased || (!voted && !kumalive.poll.finished)) {
 		    learnerPollJSON.remove("votes");
 		}
-		if (!kumalive.poll.votersShown || (!voted && !kumalive.poll.finished)) {
+		if (!kumalive.poll.votersReleased || (!voted && !kumalive.poll.finished)) {
 		    learnerPollJSON.remove("voters");
 		}
 		if (voted) {
@@ -674,6 +677,39 @@
     }
 
     /**
+     * Allow learners to see votes and/or voters
+     */
+    private void releasePollResults(JSONObject requestJSON, Session websocket) throws IOException, JSONException {
+	Integer organisationId = Integer
+		.valueOf(websocket.getRequestParameterMap().get(AttributeNames.PARAM_ORGANISATION_ID).get(0));
+
+	User user = getUser(websocket);
+	Integer userId = user.getUserId();
+
+	if (!KumaliveWebsocketServer.getSecurityService().hasOrgRole(organisationId, userId,
+		new String[] { Role.GROUP_MANAGER, Role.MONITOR }, "kumalive poll release results", false)) {
+	    String warning = "User " + userId + " is not a monitor of organisation " + organisationId;
+	    logger.warn(warning);
+	    return;
+	}
+
+	KumaliveDTO kumalive = kumalives.get(organisationId);
+	kumalive.poll.votersReleased |= requestJSON.optBoolean("votersReleased", false);
+	kumalive.poll.votesReleased |= kumalive.poll.votersReleased || requestJSON.optBoolean("votesReleased", false);
+	KumaliveWebsocketServer.getKumaliveService().releasePollResults(kumalive.poll.pollId,
+		kumalive.poll.votesReleased, kumalive.poll.votersReleased);
+	kumalive.poll.pollJSON.put("votesReleased", kumalive.poll.votesReleased);
+	kumalive.poll.pollJSON.put("votersReleased", kumalive.poll.votersReleased);
+
+	if (logger.isDebugEnabled()) {
+	    logger.debug("Teacher " + userId + " released votes/voters ( " + kumalive.poll.votesReleased + "/"
+		    + kumalive.poll.votersReleased + ") of poll " + kumalive.poll.pollId + " in Kumalive "
+		    + kumalive.id);
+	}
+	sendRefresh(kumalive);
+    }
+
+    /**
      * Tell learners that the teacher started a poll
      */
     private void finishPoll(JSONObject requestJSON, Session websocket) throws IOException, JSONException {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
===================================================================
diff -u -redcf26c6dbd1e4ff36858d876e908774abb7910d -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java	(.../KumalivePoll.java)	(revision edcf26c6dbd1e4ff36858d876e908774abb7910d)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java	(.../KumalivePoll.java)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -34,6 +34,8 @@
     private Long pollId;
     private Kumalive kumalive;
     private String name;
+    private Boolean votesReleased;
+    private Boolean votersReleased;
     private Date startDate;
     private Date finishDate;
     private Set<KumalivePollAnswer> answers;
@@ -72,6 +74,22 @@
 	this.name = name;
     }
 
+    public Boolean getVotesReleased() {
+	return votesReleased;
+    }
+
+    public void setVotesReleased(Boolean votesReleased) {
+	this.votesReleased = votesReleased;
+    }
+
+    public Boolean getVotersReleased() {
+	return votersReleased;
+    }
+
+    public void setVotersReleased(Boolean votersReleased) {
+	this.votersReleased = votersReleased;
+    }
+
     public Date getStartDate() {
 	return startDate;
     }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
===================================================================
diff -u -r00c630a99ddb827c772bd0fc0d8d903cc0079f7e -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java	(.../IKumaliveService.java)	(revision 00c630a99ddb827c772bd0fc0d8d903cc0079f7e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java	(.../IKumaliveService.java)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -68,4 +68,6 @@
     void finishPoll(Long pollId) throws JSONException;
 
     void saveVote(Long answerId, Integer userId);
+
+    void releasePollResults(Long pollId, boolean votesReleased, boolean votersReleased);
 }
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
===================================================================
diff -u -r00c630a99ddb827c772bd0fc0d8d903cc0079f7e -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java	(.../KumaliveService.java)	(revision 00c630a99ddb827c772bd0fc0d8d903cc0079f7e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java	(.../KumaliveService.java)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -595,6 +595,17 @@
     }
 
     /**
+     * Set whether learners can see vote results and voters' names
+     */
+    @Override
+    public void releasePollResults(Long pollId, boolean votesReleased, boolean votersReleased) {
+	KumalivePoll poll = (KumalivePoll) kumaliveDAO.find(KumalivePoll.class, pollId);
+	poll.setVotesReleased(votesReleased || votersReleased);
+	poll.setVotersReleased(votersReleased);
+	kumaliveDAO.update(poll);
+    }
+
+    /**
      * Finishes a poll, i.e. prevents learners from voting
      */
     @Override
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
===================================================================
diff -u -r5b60c76a61d420733e2c4c96513249cb9a65a484 -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 5b60c76a61d420733e2c4c96513249cb9a65a484)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -100,6 +100,7 @@
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
 				<prop key="save*">PROPAGATION_REQUIRED</prop>
 				<prop key="export*">PROPAGATION_REQUIRED</prop>
+				<prop key="release*">PROPAGATION_REQUIRED</prop>
    			</props>
 		</property>
 	</bean> 
Index: lams_learning/web/css/kumalive.scss
===================================================================
diff -u -r713741e9ab4f79f0d97486155f1f3e351b3c460d -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/web/css/kumalive.scss	(.../kumalive.scss)	(revision 713741e9ab4f79f0d97486155f1f3e351b3c460d)
+++ lams_learning/web/css/kumalive.scss	(.../kumalive.scss)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -59,7 +59,7 @@
 	display: none;
 }
 
-#pollSetupButtons {
+#pollSetupButtons, #pollSetup h3 {
 	text-align: center;
 }
 
Index: lams_learning/web/includes/javascript/kumalive.js
===================================================================
diff -u -r713741e9ab4f79f0d97486155f1f3e351b3c460d -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/web/includes/javascript/kumalive.js	(.../kumalive.js)	(revision 713741e9ab4f79f0d97486155f1f3e351b3c460d)
+++ lams_learning/web/includes/javascript/kumalive.js	(.../kumalive.js)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -185,6 +185,8 @@
 		});
 		$('#pollSetupCancelButton').click(setupPollCancel);
 		$('#pollSetupStartButton').click(startPoll);
+		$('#pollRunReleaseVotesButton').click(releaseVotes);
+		$('#pollRunReleaseVotersButton').click(releaseVoters);
 		$('#pollRunFinishButton').click(finishPoll);
 		$('#pollRunCloseButton').click(closePoll);
 		$('#finishButton').click(finish).show();
@@ -337,7 +339,7 @@
 			$('#pollCell').hide();
 			$('#actionCell .pollButton').prop('disabled', false);
 			
-			$('#learnersCell .learner .badge').remove();
+			$('#learnersCell .learner .badge, #pollCell .pollVoters').remove();
 		}
 		return;
 	}
@@ -756,6 +758,16 @@
 		// extra options for teacher
 	
 		if (roleTeacher) {
+			if (poll.votesReleased)
+				$('#pollRunReleaseVotesButton').hide();
+			else {
+				$('#pollRunReleaseVotesButton').show();
+			}
+			if (poll.votersReleased)
+				$('#pollRunReleaseVotersButton').hide();
+			else {
+				$('#pollRunReleaseVotersButton').show();
+			}
 			if (poll.finished) {
 				$('#pollRunCloseButton').show();
 			} else {
@@ -876,6 +888,34 @@
 }
 
 /**
+ * Tell server that votes were released
+ */ 
+function releaseVotes() {
+	if (!confirm(LABELS.POLL_RELEASE_VOTES_CONFIRM)){
+		return;
+	}
+	kumaliveWebsocket.send(JSON.stringify({
+		'type' 		    : 'releasePollResults',
+		'votesReleased' : true
+	}));
+	$('#pollRunReleaseVotesButton').hide();
+}
+
+/**
+ * Tell server that voters were released
+ */ 
+function releaseVoters() {
+	if (!confirm(LABELS.POLL_RELEASE_VOTERS_CONFIRM)){
+		return;
+	}
+	kumaliveWebsocket.send(JSON.stringify({
+		'type' 		     : 'releasePollResults',
+		'votersReleased' : true
+	}));
+	$('#pollRunReleaseVotesButton, #pollRunReleaseVotersButton').hide();
+}
+
+/**
  * Prevent learners from voting
  */
 function finishPoll() {
Index: lams_learning/web/kumalive/kumalive.jsp
===================================================================
diff -u -r713741e9ab4f79f0d97486155f1f3e351b3c460d -rc32fc3365594b9d572ea07094f580218cf952c93
--- lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 713741e9ab4f79f0d97486155f1f3e351b3c460d)
+++ lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision c32fc3365594b9d572ea07094f580218cf952c93)
@@ -40,7 +40,11 @@
 				<fmt:message key="label.kumalive.finish.speak" var="SPEAK_FINISH_VAR"/>
 				SPEAK_FINISH : '<c:out value="${SPEAK_FINISH_VAR}" />',
 				<fmt:message key="message.kumalive.poll.finish.confirm" var="POLL_FINISH_CONFIRM_VAR"/>
-				POLL_FINISH_CONFIRM : decoderDiv.html('<c:out value="${POLL_FINISH_CONFIRM_VAR}" />').text()
+				POLL_FINISH_CONFIRM : decoderDiv.html('<c:out value="${POLL_FINISH_CONFIRM_VAR}" />').text(),
+				<fmt:message key="message.kumalive.poll.release.votes.confirm" var="POLL_RELEASE_VOTES_CONFIRM_VAR"/>
+				POLL_RELEASE_VOTES_CONFIRM : decoderDiv.html('<c:out value="${POLL_RELEASE_VOTES_CONFIRM_VAR}" />').text(),
+				<fmt:message key="message.kumalive.poll.release.voters.confirm" var="POLL_RELEASE_VOTERS_CONFIRM_VAR"/>
+				POLL_RELEASE_VOTERS_CONFIRM : decoderDiv.html('<c:out value="${POLL_RELEASE_VOTERS_CONFIRM_VAR}" />').text()
 			};
 			
 	</script>
@@ -74,7 +78,7 @@
 					<div class="profilePicture"></div>
 					<div class="name"></div>
 					<button id="raiseHandPromptButton" class="btn btn-default"><fmt:message key="button.kumalive.ask"/></button><br />
-					<button class="pollButton btn btn-default"><fmt:message key="button.kumalive.poll"/></button><br />
+					<button class="pollButton btn btn-default"><fmt:message key="button.kumalive.poll.create"/></button><br />
 					<button id="finishButton" class="btn btn-default"><fmt:message key="button.kumalive.finish.kumalive"/></button>
 				</div>
 				<div id="raiseHandPrompt">
@@ -96,6 +100,7 @@
 			</div>
 			<div id="pollCell" class="col-md-1">
 				<div id="pollSetup">
+					<h3><fmt:message key='button.kumalive.poll'/></h3>
 					<div id="pollSetupQuestionGroup" class="form-group">
 						<label for="pollSetupQuestion" class="control-label">
 							<h4><fmt:message key="label.kumalive.poll.question"/></h4>
@@ -156,6 +161,12 @@
 						<fmt:message key='button.kumalive.poll.vote'/>
 					</button>
 					<ul id="pollRunAnswerList" class="list-group"></ul>
+					<button id="pollRunReleaseVotesButton" class="btn btn-default">
+						<fmt:message key='button.kumalive.poll.release.votes'/>
+					</button>
+					<button id="pollRunReleaseVotersButton" class="btn btn-default">
+						<fmt:message key='button.kumalive.poll.release.voters'/>
+					</button>
 					<button id="pollRunFinishButton" class="btn btn-default">
 						<fmt:message key='button.kumalive.poll.finish'/>
 					</button>