Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java,v
diff -u -r1.32.2.5 -r1.32.2.6
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	11 May 2016 07:07:36 -0000	1.32.2.5
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	28 Jul 2016 03:46:21 -0000	1.32.2.6
@@ -147,6 +147,7 @@
 	groupForm.set("previewLesson", learnerProgress.getLesson().isPreviewLesson());
 	groupForm.set("title", activity.getTitle());
 
+	request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId);
 	if (groupingDone) {
 	    request.setAttribute(GroupingAction.FINISHED_BUTTON, Boolean.TRUE);
 	    return mapping.findForward(GroupingAction.VIEW_GROUP);
Index: lams_learning/web/layout/groupWaitLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/groupWaitLayout.jsp,v
diff -u -r1.10.12.2 -r1.10.12.3
--- lams_learning/web/layout/groupWaitLayout.jsp	17 Mar 2016 11:20:59 -0000	1.10.12.2
+++ lams_learning/web/layout/groupWaitLayout.jsp	28 Jul 2016 03:47:50 -0000	1.10.12.3
@@ -27,6 +27,7 @@
 	<lams:head>
 		<title><fmt:message key="${label.view.groups.title}"/></title>
 		<lams:css/>
+		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 		<META HTTP-EQUIV="Refresh" CONTENT="300;URL=<lams:WebAppURL/>/grouping.do?method=performGrouping&activityID=${activity.activityId}">
 	  </lams:head>
 
Index: lams_learning/web/layout/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v
diff -u -r1.18.12.4 -r1.18.12.5
--- lams_learning/web/layout/layout.jsp	17 Mar 2016 11:20:59 -0000	1.18.12.4
+++ lams_learning/web/layout/layout.jsp	28 Jul 2016 03:47:50 -0000	1.18.12.5
@@ -42,7 +42,8 @@
 	<c:set var="lams">
 		<lams:LAMSURL />
 	</c:set>
-		
+
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript"
 		src="${lams}includes/javascript/common.js"></script>
 </lams:head>