Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.110 -r1.420.2.111
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java,v
diff -u -r1.26.2.6 -r1.26.2.7
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	16 Aug 2016 19:04:12 -0000	1.26.2.6
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	27 Jan 2017 05:32:29 -0000	1.26.2.7
@@ -102,6 +102,15 @@
      * @return
      */
     Long getLeaderUserId(Long toolSessionId, Integer learnerId);
+    
+    /**
+     * Returns all leaders available in the nearest leader selection tool (that is all leaders in all sessions).
+     * 
+     * @param toolSessionId
+     * @param learnerId
+     * @return
+     */
+    Set<Long> getAllLeaderUserIds(Long toolSessionId, Integer learnerId);
 
     /**
      * Returns leaders' userIds for all tool sessions from the given Leader Selection Tool.
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java,v
diff -u -r1.29.2.8 -r1.29.2.9
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	16 Aug 2016 19:04:12 -0000	1.29.2.8
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	27 Jan 2017 05:32:29 -0000	1.29.2.9
@@ -237,7 +237,24 @@
 
 	return leaderUserId;
     }
+    
+    @Override
+    public Set<Long> getAllLeaderUserIds(Long toolSessionId, Integer learnerId) {
+	Set<Long> leaderUserIds = null;
 
+	ToolSession toolSession = this.getToolSession(toolSessionId);
+	ToolActivity specifiedActivity = toolSession.getToolActivity();
+	Activity leaderSelectionActivity = getNearestLeaderSelectionActivity(specifiedActivity, learnerId,
+		toolSession.getLesson().getLessonId());
+	
+	// check if there is leaderSelectionTool available
+	if (leaderSelectionActivity != null) {
+	    leaderUserIds = getLeaderUserId(leaderSelectionActivity.getActivityId());
+	}
+	
+	return leaderUserIds;
+    }
+
     @Override
     @SuppressWarnings("unchecked")
     public Set<Long> getLeaderUserId(Long leaderSelectionActivityId) {