Index: lams_tool_doku/lams_tool_doku.eml
===================================================================
diff -u -re7b29886c3fc2a5edef72022a8df8b1833ac6b47 -r550d081b65db263d8987a1cfa42408bc75bba619
--- lams_tool_doku/lams_tool_doku.eml	(.../lams_tool_doku.eml)	(revision e7b29886c3fc2a5edef72022a8df8b1833ac6b47)
+++ lams_tool_doku/lams_tool_doku.eml	(.../lams_tool_doku.eml)	(revision 550d081b65db263d8987a1cfa42408bc75bba619)
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component inheritJdk="true">
-	<contentEntry url="file://$MODULE_DIR$"/>
+	<contentEntry url="file://$MODULE_DIR$">
+		<excludeFolder url="file://$MODULE_DIR$/bin"/>
+		<excludeFolder url="file://$MODULE_DIR$/build"/>
+	</contentEntry>
 	<lib name="commons-lang-2.6.jar" scope="COMPILE">
 		<srcroot url="file://$3RDPARTY_SOURCES_PROJECT_47$/commons-lang"/>
 	</lib>
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
===================================================================
diff -u -r24a95fc64bb064bbb80f689474c0b797b0a8a60d -r550d081b65db263d8987a1cfa42408bc75bba619
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 24a95fc64bb064bbb80f689474c0b797b0a8a60d)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 550d081b65db263d8987a1cfa42408bc75bba619)
@@ -23,28 +23,9 @@
 
 package org.lamsfoundation.lams.tool.dokumaran.web.controller;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.security.InvalidParameterException;
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.etherpad.EtherpadException;
@@ -65,11 +46,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.DateUtil;
-import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.*;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -78,15 +55,19 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.*;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.security.InvalidParameterException;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Controller
 @RequestMapping("/monitoring")
@@ -208,10 +189,12 @@
 	// identify sorting type
 	int sorting = LEARNER_MARKS_SORTING_FIRST_NAME_ASC;
 	if (isSortFirstName != null) {
-	    sorting = isSortFirstName.equals(1) ? LEARNER_MARKS_SORTING_FIRST_NAME_DESC
+	    sorting = isSortFirstName.equals(1)
+		    ? LEARNER_MARKS_SORTING_FIRST_NAME_DESC
 		    : LEARNER_MARKS_SORTING_FIRST_NAME_ASC;
 	} else if (isSortLastName != null) {
-	    sorting = isSortLastName.equals(1) ? LEARNER_MARKS_SORTING_LAST_NAME_DESC
+	    sorting = isSortLastName.equals(1)
+		    ? LEARNER_MARKS_SORTING_LAST_NAME_DESC
 		    : LEARNER_MARKS_SORTING_LAST_NAME_ASC;
 	}
 
@@ -236,9 +219,8 @@
 	    responsedata.put("total_rows", users.size());
 
 	    ToolSession toolSession = toolService.getToolSessionById(toolSessionId);
-	    Map<Integer, Double> gradebookUserActivities = gradebookService
-		    .getGradebookUserActivities(toolSession.getToolActivity().getActivityId()).stream()
-		    .filter(g -> g.getMark() != null)
+	    Map<Integer, Double> gradebookUserActivities = gradebookService.getGradebookUserActivities(
+			    toolSession.getToolActivity().getActivityId()).stream().filter(g -> g.getMark() != null)
 		    .collect(Collectors.toMap(g -> g.getLearner().getUserId(), GradebookUserActivity::getMark));
 
 	    DokumaranUser leader = users.get(0).getSession().getGroupLeader();
@@ -262,6 +244,7 @@
     }
 
     @RequestMapping(path = "/updateLearnerMark", method = RequestMethod.POST)
+    @ResponseBody
     private void updateLearnerMark(@RequestParam long toolSessionId, @RequestParam int userId,
 	    @RequestParam Double mark) {
 	ToolSession toolSession = toolService.getToolSessionById(toolSessionId);
@@ -368,7 +351,8 @@
 	Dokumaran dokumaran = dokumaranService.getDokumaranByContentId(toolContentId);
 	dokumaran.setRelativeTimeLimit(relativeTimeLimit);
 	// set time limit as seconds from start of epoch, using current server time zone
-	dokumaran.setAbsoluteTimeLimit(absoluteTimeLimit == null ? null
+	dokumaran.setAbsoluteTimeLimit(absoluteTimeLimit == null
+		? null
 		: LocalDateTime.ofEpochSecond(absoluteTimeLimit, 0, OffsetDateTime.now().getOffset()));
 	dokumaranService.saveOrUpdate(dokumaran);
     }
@@ -389,8 +373,8 @@
 	if (grouping != null) {
 	    Set<Group> groups = grouping.getGroups();
 	    for (Group group : groups) {
-		if (!group.getUsers().isEmpty()
-			&& group.getGroupName().toLowerCase().contains(searchString.toLowerCase())) {
+		if (!group.getUsers().isEmpty() && group.getGroupName().toLowerCase()
+			.contains(searchString.toLowerCase())) {
 		    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		    groupJSON.put("label", groupLabel + group.getGroupName() + "\"");
 		    groupJSON.put("value", "group-" + group.getGroupId());
@@ -535,4 +519,4 @@
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	return user != null ? user.getUserID() : null;
     }
-}
+}
\ No newline at end of file