Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r9bed25d526afd2f930626ad5c82f8b76711191d8 -rb616b4a2df3217f70583fa5f62a59a1488b33f84
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision 9bed25d526afd2f930626ad5c82f8b76711191d8)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp	(.../scratchies.jsp)	(revision b616b4a2df3217f70583fa5f62a59a1488b33f84)
@@ -1,3 +1,14 @@
+
+<c:if test="${isQuestionEtherpadEnabled}">
+	<%-- Prepare same content for each question Etherpad. Each group participant's first and last name --%>
+	<c:set var="questionEtherpadContent">
+		<c:forEach items="${allGroupUsers}" var="user"><c:out value="${user.firstName}" /> <c:out value="${user.lastName}" />:<br />
+	<br />
+	<br />
+	<br /></c:forEach>
+	</c:set>
+</c:if>
+
 <c:forEach var="item" items="${sessionMap.itemList}">
 	<div class="lead">
         <a name="${item.title}" style="text-decoration:none;color:black"><c:out value="${item.title}" escapeXml="true" /></a>
@@ -90,6 +101,21 @@
 		</c:forEach>
 	</table>
 
+	<c:if test="${isQuestionEtherpadEnabled}">
+		<%--Display Etherpad for each question --%>
+		<div class="panel panel-default question-etherpad">
+			<div class="panel-heading">
+				<div class="panel-title">
+					<fmt:message key="label.etherpad.discussion" />
+				</div>
+			</div>
+			<div class="panel-body">
+				<lams:Etherpad groupId="etherpad-scratchie-${toolSessionID}-question-${item.uid}" 
+				   showControls="${mode eq 'teacher'}" showChat="false" height="200"
+				>${questionEtherpadContent}</lams:Etherpad>
+			</div>
+		</div>
+	</c:if>
 	
 	<%-- show burning questions --%>
 	<c:if test="${!showResults && scratchie.burningQuestionsEnabled && (isUserLeader || (mode == 'teacher'))}">