Index: lams_central/conf/scss/_bootstrap-variables.scss
===================================================================
diff -u -r6455f6e20efee02e4c447821693548724bb9cf8c -r88f3c4e68acd7c0ad6bcab7c6a3f36197d009468
--- lams_central/conf/scss/_bootstrap-variables.scss	(.../_bootstrap-variables.scss)	(revision 6455f6e20efee02e4c447821693548724bb9cf8c)
+++ lams_central/conf/scss/_bootstrap-variables.scss	(.../_bootstrap-variables.scss)	(revision 88f3c4e68acd7c0ad6bcab7c6a3f36197d009468)
@@ -296,14 +296,14 @@
 // Medium screen / desktop
 //** Deprecated `$screen-md` as of v3.0.1
 // $screen-md:                  992px
-// $screen-md-min:              $screen-md
+$screen-md-min:              992px;
 //** Deprecated `$screen-desktop` as of v3.0.1
 // $screen-desktop:             $screen-md-min
 
 // Large screen / wide desktop
 //** Deprecated `$screen-lg` as of v3.0.1
 // $screen-lg:                  1200px
-// $screen-lg-min:              $screen-lg
+$screen-lg-min:              1200px;
 //** Deprecated `$screen-lg-desktop` as of v3.0.1
 // $screen-lg-desktop:          $screen-lg-min
 
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0b8d119797d69e0add835267e618765b5c1dc069 -r88f3c4e68acd7c0ad6bcab7c6a3f36197d009468
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0b8d119797d69e0add835267e618765b5c1dc069)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 88f3c4e68acd7c0ad6bcab7c6a3f36197d009468)
@@ -157,6 +157,17 @@
 button.kumalive.ok  =OK
 button.kumalive.report.export.all  =Export all
 button.kumalive.report.export.selected  =Export selected
-
-
+button.kumalive.poll =Quick poll
+label.kumalive.poll.question =Question (optional)
+label.kumalive.poll.question.tip =for example: Why is the sky blue?
+label.kumalive.poll.answer =Answers
+label.kumalive.poll.answer.true =True
+label.kumalive.poll.answer.false =False
+label.kumalive.poll.answer.positive =Positive
+label.kumalive.poll.answer.negative =Negative
+label.kumalive.poll.answer.yes =Yes
+label.kumalive.poll.answer.no =No
+label.kumalive.poll.answer.custom =Custom...
+label.kumalive.poll.answer.custom.tip ={Put} {each} {answer} {in} {curly} {brackets}
+button.kumalive.poll.start =Ask now!
 #======= End labels: Exported 151 labels for en AU =====
Index: lams_learning/web/css/kumalive.scss
===================================================================
diff -u -r8801d631fc068473de07e602113cbe314d972052 -r88f3c4e68acd7c0ad6bcab7c6a3f36197d009468
--- lams_learning/web/css/kumalive.scss	(.../kumalive.scss)	(revision 8801d631fc068473de07e602113cbe314d972052)
+++ lams_learning/web/css/kumalive.scss	(.../kumalive.scss)	(revision 88f3c4e68acd7c0ad6bcab7c6a3f36197d009468)
@@ -36,18 +36,41 @@
 	vertical-align: top;
 }
 
-#learnersCell {
-	width: 100%;
-	padding: 0;
+#actionCell button {
+	width: 70%;
+	margin-top: 10px;
 }
 
-#actionCell button {
+#pollCell {
+	display: none;
+	padding-bottom: 10px;
+	border-bottom: $border-thin-black;
+}
+
+#pollSetupAnswer {
+	width: initial;
+}
+
+#pollSetupAnswerCustom {
+	display: none;
+}
+
+#pollSetupButtons {
+	text-align: center;
+}
+
+#pollSetupButtons button {
 	width: 70%;
 	margin-top: 10px;
 }
 
+#learnersCell {
+	width: 100%;
+	padding: 0;
+}
+
 #learnersContainer {
-	padding-left: 15px;
+	padding-left: 10px;
 }
 
 #raiseHandContainer {
@@ -121,6 +144,7 @@
 
 .score {
 	display: none;
+	margin-top: 10px;
 }
 
 .score span {
@@ -153,15 +177,22 @@
 	display: none;
 }
 
-@media (min-width : $screen-sm-min) {
+@media (min-width : $screen-md-min) {
 	#actionCell {
 		width: 350px;
 		height: 100vh;
+		margin-right: 10px;
 		border-bottom: none;
 		border-right: $border-thin-black;
 	}
-	#learnersCell {
-		width: calc(100% - 350px);
+	
+	#pollCell {
+		width: 500px;
+		height: 100vh;
+		padding-left: 0;
+		margin-right: 10px;
+		border-bottom: none;
+		border-right: $border-thin-black;
 	}
 	
 	.learner {
Index: lams_learning/web/includes/javascript/kumalive.js
===================================================================
diff -u -rd96eaa6be28787c68f898a2455efc1b957f5447d -r88f3c4e68acd7c0ad6bcab7c6a3f36197d009468
--- lams_learning/web/includes/javascript/kumalive.js	(.../kumalive.js)	(revision d96eaa6be28787c68f898a2455efc1b957f5447d)
+++ lams_learning/web/includes/javascript/kumalive.js	(.../kumalive.js)	(revision 88f3c4e68acd7c0ad6bcab7c6a3f36197d009468)
@@ -165,10 +165,19 @@
 	roleTeacher = message.isTeacher && message.roleTeacher;
 	
 	// hide all buttons and enable ones appropriate for the role
-	$('#mainDiv button').hide();
+	$('#actionCell button').hide();
 	if (roleTeacher) {
 		$('#raiseHandPromptButton').click(raiseHandPrompt);
 		$('#downHandPromptButton').click(downHandPrompt);
+		$('#pollButton').click(pollSetup).show();
+		$('#pollSetupAnswer').change(function(){
+			if ($('#pollSetupAnswer option:selected').val() === 'custom') {
+				$('#pollSetupAnswerCustom').show();
+			} else {
+				$('#pollSetupAnswerCustom').hide();
+			}
+		});
+		$('#pollSetupCancelButton').click(pollSetupCancel);
 		$('#score i').click(score);
 		$('#finishButton').click(finish).show();
 	} else {
@@ -290,7 +299,6 @@
 		}
 		learnerFadeIn(learnerDiv);
 	});
-	
 	// remove learners who left
 	$('.learner', learnersContainer).each(function(){
 		var learnerDiv = $(this),
@@ -601,7 +609,18 @@
 	}
 }
 
+function pollSetup() {
+	$('#pollButton').prop('disabled', true);
+	$('#pollCell').show();
+}
 
+function pollSetupCancel() {
+	$('#pollCell').hide();
+	$('#pollCell input').val(null);
+	$('#pollCell select option:first-child').prop('selected', true);
+	$('#pollButton').prop('disabled', false);
+}
+
 /**
  * Create a new Kumalive
  */
Index: lams_learning/web/kumalive/kumalive.jsp
===================================================================
diff -u -r8801d631fc068473de07e602113cbe314d972052 -r88f3c4e68acd7c0ad6bcab7c6a3f36197d009468
--- lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 8801d631fc068473de07e602113cbe314d972052)
+++ lams_learning/web/kumalive/kumalive.jsp	(.../kumalive.jsp)	(revision 88f3c4e68acd7c0ad6bcab7c6a3f36197d009468)
@@ -64,12 +64,13 @@
 	</div>
 	<div id="mainDiv" class="container-fluid">
 		<div class="row">
-			<div id="actionCell" class="col-sm-11">
+			<div id="actionCell" class="col-md-1">
 				<div id="teacher" class="speaker">
 					<h3><fmt:message key="label.kumalive.teacher"/></h3>
 					<div class="profilePicture"></div>
 					<div class="name"></div>
 					<button id="raiseHandPromptButton" class="btn btn-default"><fmt:message key="button.kumalive.ask"/></button><br />
+					<button id="pollButton" class="btn btn-default"><fmt:message key="button.kumalive.poll"/></button><br />
 					<button id="finishButton" class="btn btn-default"><fmt:message key="button.kumalive.finish.kumalive"/></button>
 				</div>
 				<div id="raiseHandPrompt">
@@ -88,7 +89,41 @@
 					<hr />
 				</div>
 			</div>
-			<div id="learnersCell" class="col-sm-1">
+			<div id="pollCell" class="col-md-1">
+				<div id="pollSetup">
+					<div class="form-group">
+						<label for="pollSetupQuestion"><h4><fmt:message key="label.kumalive.poll.question"/></h4></label>
+						<input id="pollSetupQuestion" type="text" class="form-control" placeholder="<fmt:message key='label.kumalive.poll.question.tip'/>" />
+					</div>
+					<div class="form-group">
+						<label for="pollSetupAnswer"><h4><fmt:message key="label.kumalive.poll.answer"/></h4></label>
+						<select id="pollSetupAnswer" class="form-control">
+							<option value="true-false">
+								<fmt:message key='label.kumalive.poll.answer.true'/>,
+								<fmt:message key='label.kumalive.poll.answer.false'/>
+							</option>
+							<option value="yes-no">
+								<fmt:message key='label.kumalive.poll.answer.yes'/>,
+								<fmt:message key='label.kumalive.poll.answer.no'/>
+							</option>
+							<option value="positive-negative">
+								<fmt:message key='label.kumalive.poll.answer.positive'/>,
+								<fmt:message key='label.kumalive.poll.answer.negative'/>
+							</option>
+							<option value="custom">
+								<fmt:message key='label.kumalive.poll.answer.custom'/>
+							</option>
+						</select><br />
+						<input id="pollSetupAnswerCustom" type="text" class="form-control"
+							   placeholder="<fmt:message key='label.kumalive.poll.answer.custom.tip'/>" />
+					</div>
+					<div id="pollSetupButtons">
+						<button id="pollSetupStartButton" class="btn btn-primary"><fmt:message key='button.kumalive.poll.start'/></button><br />
+						<button id="pollSetupCancelButton" class="btn btn-default"><fmt:message key='label.cancel.button'/></button>
+					</div>
+				</div>
+			</div>
+			<div id="learnersCell">
 				<div id="raiseHandContainer">
 					<h4><fmt:message key="label.kumalive.raised.hands"/></h4>
 				</div>