Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -ra082fc4c4f94c475538e6101ead7ceb316337fb3 -r2db54768ed82bc5868fa55c0bfb46445fdb06770
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
@@ -52,7 +52,7 @@
 pageTitle.admin = doKu settings
 label.select.leader = Leader selection
 label.use.select.leader.tool.output = Use leaders from Select Leader tool
-label.show.chat = Show the chat button
+label.show.chat = Enable chat
 label.show.line.numbers = Show the line numbers
 admin.formError = Missing values, please make sure all required fields are entered.
 admin.etherpad.url = Etherpad server URL
@@ -120,7 +120,6 @@
 label.monitoring.leader.not.changed = Leader was not changed
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
-label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions. 
 label.attendance = Attendance
 label.monitoring.summary.time.limit.individual.placeholder = Type name
 label.monitoring.summary.time.limit.finish.now.confirm = Are you sure you want to make all learners finish their work right now?
@@ -141,3 +140,6 @@
 label.monitoring.summary.time.limit.relative.desc = Set the duration in minutes that the learners will have to have to complete the assessment. The duration will apply from the moment each learner begins the assessment. For example, if set to 5 minutes, all learners will have 5 minutes from the moment each of them start the assessment.
 label.monitoring.summary.time.limit.relative = Duration relative to from student start
 label.monitoring.summary.time.limit = Timing limits
+label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions.
+label.monitoring.learner.marks.name = Name
+label.show.chat.tooltip = Enables the chat feature allowing students to exchange messages while working on the document simultaneously.
Index: lams_tool_doku/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r2db54768ed82bc5868fa55c0bfb46445fdb06770
--- lams_tool_doku/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
@@ -118,6 +118,9 @@
 label.monitoring.change.leader = Αλλαγή συντονιστή
 label.monitoring.leader.successfully.changed = Ο Συντονιστής άλλαξε
 label.monitoring.leader.not.changed = Ο Συντονιστής δεν άλλαξε
+label.authoring.basic.instructions.tooltip = Εάν θέλετε οι μαθητές να έχουν ένα πρότυπο έγγραφο το οποίο θα τους βοηθήσει στη συνεργασία τους για την εύρεση της απάντησή τους, προσθέστε το πρότυπό σας εδώ.
+label.authoring.basic.description.tooltip = Περιγραφή ή περίπτωση που θα παρουσιαστεί στους εκπαιδεύομενους.
+label.attendance = Συμμετοχή
 label.monitoring.summary.time.limit.individual.placeholder = Πληκτρολογήστε όνομα
 label.monitoring.summary.time.limit.finish.now.confirm = Είστε βέβαιοι ότι θέλετε να κάνετε όλους τους εκπαιδευόμενους να ολοκληρώσουν τη δουλειά/αξιολόγησή τους τώρα;
 label.monitoring.summary.time.limit.finish.now = Τελειώστε τώρα
@@ -137,3 +140,5 @@
 label.monitoring.summary.time.limit.relative.desc = Ορίστε τη διάρκεια σε λεπτά που οι εκπαιδευόμενοι θα πρέπει να ολοκληρώσουν την αξιολόγηση. Η διάρκεια θα ισχύει από τη στιγμή που κάθε εκπαιδευόμενος θα ξεκινήσει την αξιολόγηση. Για παράδειγμα, αν οριστεί σε 5 λεπτά, όλοι οι μαθητές θα έχουν 5 λεπτά από τη στιγμή που ο καθένας θα ξεκινήσει την αξιολόγηση.
 label.monitoring.summary.time.limit.relative = Διάρκεια σχετική με την έναρξη από τον εκπαιδευόμενο
 label.monitoring.summary.time.limit = Χρονικό όριο
+label.time.limit.tooltip = Αριθμός λεπτών που θα έχει  κάθε μαθητής από τη στιγμή που θα εισέλθει σε αυτήν τη δραστηριότητα. Αφήστε το στο 0 αν δεν θέλετε χρονικό περιορισμό.
+label.monitoring.learner.marks.name = Όνομα
Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -ra082fc4c4f94c475538e6101ead7ceb316337fb3 -r2db54768ed82bc5868fa55c0bfb46445fdb06770
--- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
@@ -52,7 +52,7 @@
 pageTitle.admin = doKu settings
 label.select.leader = Leader selection
 label.use.select.leader.tool.output = Use leaders from Select Leader tool
-label.show.chat = Show the chat button
+label.show.chat = Enable chat
 label.show.line.numbers = Show the line numbers
 admin.formError = Missing values, please make sure all required fields are entered.
 admin.etherpad.url = Etherpad server URL
@@ -120,7 +120,6 @@
 label.monitoring.leader.not.changed = Leader was not changed
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
-label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions. 
 label.attendance = Attendance
 label.monitoring.summary.time.limit.individual.placeholder = Type name
 label.monitoring.summary.time.limit.finish.now.confirm = Are you sure you want to make all learners finish their work right now?
@@ -141,3 +140,6 @@
 label.monitoring.summary.time.limit.relative.desc = Set the duration in minutes that the learners will have to have to complete the assessment. The duration will apply from the moment each learner begins the assessment. For example, if set to 5 minutes, all learners will have 5 minutes from the moment each of them start the assessment.
 label.monitoring.summary.time.limit.relative = Duration relative to from student start
 label.monitoring.summary.time.limit = Timing limits
+label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions.
+label.monitoring.learner.marks.name = Name
+label.show.chat.tooltip = Enables the chat feature allowing students to exchange messages while working on the document simultaneously.
Index: lams_tool_doku/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r2db54768ed82bc5868fa55c0bfb46445fdb06770
--- lams_tool_doku/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
@@ -52,7 +52,7 @@
 pageTitle.admin = Configuración de DoKu
 label.select.leader = Selección de líder
 label.use.select.leader.tool.output = Utilice los líderes de herramienta Seleccionar Líder
-label.show.chat = Mostrar el botón de chat
+label.show.chat = Habilitar la función de chat
 label.show.line.numbers = Mostrar los números de línea
 admin.formError = Hay valores faltantes. Por favor, asegúrese que todos los campos han sido ingresados.
 admin.etherpad.url = URL del servidor Etherpad
@@ -140,3 +140,6 @@
 label.monitoring.summary.time.limit.relative.desc = Establezca la duración en minutos que los estudiantes tendrán que completar la evaluación. La duración se aplicará desde el momento en que cada estudiante comience la evaluación. Por ejemplo, si se establece en 5 minutos, todos los estudiantes tendrán 5 minutos desde el momento en que cada uno de ellos comience la evaluación.
 label.monitoring.summary.time.limit.relative = Duración relativa desde el inicio de la evaluación
 label.monitoring.summary.time.limit = Límites de tiempo
+label.time.limit.tooltip = Número de minutos que tendrá cada alumno desde que entre en esta actividad. Déjelo en 0 para no tener restricciones de tiempo.
+label.monitoring.learner.marks.name = Nombre
+label.show.chat.tooltip = Habilita la función de chat que permite a los estudiantes intercambiar mensajes mientras trabajan en el documento simultáneamente.
Index: lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -raa932dd995a61adeed918456c6257a4a9a9cea74 -r2db54768ed82bc5868fa55c0bfb46445fdb06770
--- lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision aa932dd995a61adeed918456c6257a4a9a9cea74)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
@@ -118,6 +118,9 @@
 label.monitoring.change.leader = Bytt leder
 label.monitoring.leader.successfully.changed = Leder er endret
 label.monitoring.leader.not.changed = Leder ble ikke endret
+label.authoring.basic.instructions.tooltip = Hvis du vil at studentene skal ha et maldokument for å veilede dem om samarbeidssvaret, legger du til malen her.
+label.authoring.basic.description.tooltip = Beskrivelse eller sak som skal presenteres for studentene.
+label.attendance = Deltakelse
 label.monitoring.summary.time.limit.individual.placeholder = Skriv inn navn
 label.monitoring.summary.time.limit.finish.now.confirm = Er du sikker på at du vil få alle studentene til å fullføre arbeidet sitt akkurat nå?
 label.monitoring.summary.time.limit.finish.now = Fullfør nå
@@ -137,3 +140,4 @@
 label.monitoring.summary.time.limit.relative.desc = Angi varigheten i minutter som studentene vil ha tilgjengelig for å fullføre vurderingen. Varigheten vil gjelde fra det øyeblikket hver student begynner vurderingen. Hvis de for eksempel er satt til 5 minutter, vil alle studenter ha 5 minutter fra det øyeblikket hver av dem starter vurderingen.
 label.monitoring.summary.time.limit.relative = Varighet i forhold til start  student
 label.monitoring.summary.time.limit = Tidsrammer
+label.monitoring.learner.marks.name = Navn
Index: lams_tool_doku/web/pages/authoring/advance.jsp
===================================================================
diff -u -ra082fc4c4f94c475538e6101ead7ceb316337fb3 -r2db54768ed82bc5868fa55c0bfb46445fdb06770
--- lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision a082fc4c4f94c475538e6101ead7ceb316337fb3)
+++ lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
@@ -50,7 +50,8 @@
 	<div class="checkbox">
 		<label for="showChat">
 			<form:checkbox path="dokumaran.showChat" id="showChat"/>
-			<fmt:message key="label.show.chat" />
+			<fmt:message key="label.show.chat" />&nbsp;
+            <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key="label.show.chat.tooltip  "/>"></i>
 		</label>
 	</div>
 	
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -ree54acf4491ad905c288655f3561554e090d176e -r2db54768ed82bc5868fa55c0bfb46445fdb06770
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision ee54acf4491ad905c288655f3561554e090d176e)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2db54768ed82bc5868fa55c0bfb46445fdb06770)
@@ -253,15 +253,11 @@
 							
 							rows += '<tr userId="' + userData['userId'] + '">';
 
-							rows += '<td>';
-							rows += 	userData['firstName'];
+							rows += '<td width="80%">';
+							rows += 	userData['firstName'] + ' ' +userData['lastName'];
 							rows += '</td>';
-							
+														
 							rows += '<td>';
-							rows += 	userData['lastName'];
-							rows += '</td>';
-							
-							rows += '<td>';
 							rows += 	userData['mark'];
 							rows += '</td>';
 
@@ -862,9 +858,8 @@
 			<h4>
 			   <fmt:message key="label.monitoring.learner.marks.header"/>
 			</h4>
-			<lams:TSTable numColumns="3" dataId='toolSessionId="${groupSummary.sessionId}"'>
-				<th><fmt:message key="label.monitoring.learner.marks.first.name"/></th>
-				<th><fmt:message key="label.monitoring.learner.marks.last.name"/></th>
+			<lams:TSTable numColumns="2" dataId='toolSessionId="${groupSummary.sessionId}"'>
+				<th><fmt:message key="label.monitoring.learner.marks.name"/></th>
 				<th><fmt:message key="label.monitoring.learner.marks.mark"/>&nbsp;
 					<small><fmt:message key="label.monitoring.learner.marks.mark.tip"/></small>
 				</th>