Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v
diff -u -r1.45.2.12 -r1.45.2.13
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	27 Oct 2016 16:02:36 -0000	1.45.2.12
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	31 Oct 2016 16:16:34 -0000	1.45.2.13
@@ -150,13 +150,13 @@
 		if ((!isSysAdmin)
 			&& (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) {
 		    moreLinks.add(new IndexLinkBean("index.classman",
-			    "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-users",
+			    "javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-ellipsis-v",
 			    null));
 		}
 		if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER)
 			|| roles.contains(Role.ROLE_AUTHOR) || roles.contains(Role.ROLE_MONITOR))) {
 		    moreLinks.add(new IndexLinkBean("index.orggroup",
-			    "javascript:showOrgGroupDialog(" + org.getOrganisationId() + ")", "fa fa-fw fa-users",
+			    "javascript:showOrgGroupingDialog(" + org.getOrganisationId() + ")", "fa fa-fw fa-users",
 			    null));
 		}
 
@@ -181,7 +181,7 @@
 		if (org.getEnableGradebookForMonitors()
 			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN))) {
 		    String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")";
-		    moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "course-gradebook-button",
+		    moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "fa fa-fw fa-list-ol",
 			    "index.coursegradebook.tooltip"));
 		}
 
Index: lams_central/web/forgotPasswordChange.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/forgotPasswordChange.jsp,v
diff -u -r1.5.2.5 -r1.5.2.6
--- lams_central/web/forgotPasswordChange.jsp	28 Oct 2016 06:10:50 -0000	1.5.2.5
+++ lams_central/web/forgotPasswordChange.jsp	31 Oct 2016 16:16:34 -0000	1.5.2.6
@@ -23,8 +23,6 @@
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript"
-		src="includes/javascript/groupDisplay.js"></script>
-	<script type="text/javascript"
 		src="includes/javascript/jquery.validate.js"></script>
 	<lams:css />
 	<title><fmt:message key="title.forgot.password" /></title>
Index: lams_central/web/orgGroup.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/orgGroup.jsp,v
diff -u -r1.4.2.7 -r1.4.2.8
--- lams_central/web/orgGroup.jsp	24 May 2016 14:28:59 -0000	1.4.2.7
+++ lams_central/web/orgGroup.jsp	31 Oct 2016 16:16:34 -0000	1.4.2.8
@@ -7,43 +7,45 @@
 <lams:html>
 <lams:head>
 	<lams:css style="main" />
-	<link rel="stylesheet" href="css/jquery-ui-redmond-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="css/orgGroup.css" type="text/css" media="screen" />
 
 	<c:set var="lessonMode" value="${not empty param.activityID}" />
 
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
-	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>
+	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
 	<script type="text/javascript" src="includes/javascript/orgGroup.js"></script>
 	<script type="text/javascript">;
-		var grouping = ${grouping};
-		var unassignedUsers = ${unassignedUsers};
-		var canEdit = ${canEdit};
-		var groupingActivityId = '${param.activityID}';
-		var lessonMode = ${lessonMode};
-		// This attribute can be empty.
-		// When true, it means that it shows already existing groups so no calls to server are needed.
-		var skipAssigningWhenCreatingGroup = ${skipInitialAssigning eq true};
-		// This attribute can be empty.
-		// When true, it means that groups can not be added or removed, but user can be still moved.
-		var usedForBranching = ${usedForBranching eq true};
+		var grouping = ${grouping},
+			organisationId = grouping.organisationId,
+			unassignedUsers = ${unassignedUsers},
+			canEdit = ${canEdit},
+			groupingActivityId = '${param.activityID}',
+			lessonMode = ${lessonMode},
+			// This attribute can be empty.
+			// When true, it means that it shows already existing groups so no calls to server are needed.
+			skipAssigningWhenCreatingGroup = ${skipInitialAssigning eq true},
+			// This attribute can be empty.
+			// When true, it means that groups can not be added or removed, but user can be still moved.
+			usedForBranching = ${usedForBranching eq true},
 		
-		var LAMS_URL = '<lams:LAMSURL/>';
-		var decoderDiv = $('<div />');
-		var LABELS = {
-			<fmt:message key="label.course.groups.prefix" var="GROUP_PREFIX_LABEL_VAR"/>
-			GROUP_PREFIX_LABEL : '<c:out value="${GROUP_PREFIX_LABEL_VAR}" />',
-			<fmt:message key="label.course.groups.remove.confirm" var="GROUP_REMOVE_LABEL_VAR"/>
-			GROUP_REMOVE_LABEL : decoderDiv.html('<c:out value="${GROUP_REMOVE_LABEL_VAR}" />').text(),
-			<fmt:message key="label.course.groups.remove.empty.confirm" var="EMPTY_GROUP_SAVE_LABEL_VAR"/>
-			EMPTY_GROUP_SAVE_LABEL : decoderDiv.html('<c:out value="${EMPTY_GROUP_SAVE_LABEL_VAR}" />').text(),
-			<fmt:message key="label.course.groups.locked" var="GROUP_LOCK_LABEL_VAR"/>
-			GROUP_LOCK_LABEL : decoderDiv.html('<c:out value="${GROUP_LOCK_LABEL_VAR}" />').text(),
-			<fmt:message key="label.course.groups.locked.transfer" var="TRANSFER_LOCKED_LABEL_VAR"/>
-			TRANSFER_LOCKED_LABEL : decoderDiv.html('<c:out value="${TRANSFER_LOCKED_LABEL_VAR}" />').text()
-		};
+			LAMS_URL = '<lams:LAMSURL/>',
+			decoderDiv = $('<div />'),
+			LABELS = {
+				<fmt:message key="label.course.groups.prefix" var="GROUP_PREFIX_LABEL_VAR"/>
+				GROUP_PREFIX_LABEL : '<c:out value="${GROUP_PREFIX_LABEL_VAR}" />',
+				<fmt:message key="label.course.groups.remove.confirm" var="GROUP_REMOVE_LABEL_VAR"/>
+				GROUP_REMOVE_LABEL : decoderDiv.html('<c:out value="${GROUP_REMOVE_LABEL_VAR}" />').text(),
+				<fmt:message key="label.course.groups.remove.empty.confirm" var="EMPTY_GROUP_SAVE_LABEL_VAR"/>
+				EMPTY_GROUP_SAVE_LABEL : decoderDiv.html('<c:out value="${EMPTY_GROUP_SAVE_LABEL_VAR}" />').text(),
+				<fmt:message key="label.course.groups.locked" var="GROUP_LOCK_LABEL_VAR"/>
+				GROUP_LOCK_LABEL : decoderDiv.html('<c:out value="${GROUP_LOCK_LABEL_VAR}" />').text(),
+				<fmt:message key="label.course.groups.locked.transfer" var="TRANSFER_LOCKED_LABEL_VAR"/>
+				TRANSFER_LOCKED_LABEL : decoderDiv.html('<c:out value="${TRANSFER_LOCKED_LABEL_VAR}" />').text()
+			};
 	</script>
 </lams:head>
 <body>
@@ -52,24 +54,13 @@
 	<c:choose>
 		<c:when test="${lessonMode}">
 			<!-- Button opening grouping page again -->
-			<div id="backButton" class="ui-button">
+			<button id="backButton" class="btn btn-default"
+				 onClick="javascript:document.location.href=LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID='+orgID+'&activityID='+activityID">
+				<i class="fa fa-users"></i>
 				<fmt:message key="label.course.groups.back" />
-			</div>
+			</button>
 		</c:when>
 		<c:otherwise>
-			<c:if test="${canEdit}">
-				<!-- It has to have inline style as it gets appended to dialog titlebar
-				     where local CSS is not visible -->
-				<a class="customDialogButton" href="#" onClick="javascript:saveOrgGroups()" style="right: 80px;">
-					<fmt:message key="button.save" />
-				</a>
-			</c:if>
-			<a class="customDialogButton" href="#"
-			   onClick="javascript:showOrgGroupDialogContents(null, 460, 460,'<lams:LAMSURL/>OrganisationGroup.do?method=viewGroupings&organisationID=' + $('#dialogOrgGroup').dialog('option', 'orgID'))"
-			   style="right: 170px;">
-				<fmt:message key="label.course.groups.back" />
-			</a>
-	
 			<fmt:message key="label.course.groups.name" />
 			<input id="groupingName" type="text"
 				<c:if test="${not canEdit or lessonMode}">
@@ -80,21 +71,34 @@
 			<span id="groupingNameBlankError" class="errorMessage">
 				<fmt:message key="label.course.groups.name.blank" />
 			</span>
+			
+			<c:if test="${canEdit}">
+				<button class="pull-right btn btn-default" onClick="javascript:saveGroups()">
+					<i class="fa fa-save"></i>
+					<span><fmt:message key="button.save" /></span>
+				</button>
+			</c:if>
+			<button class="pull-right btn btn-default" 
+			   onClick="javascript:window.parent.showOrgGroupingDialog(organisationId)"
+			>
+				<i class="fa fa-users"></i>
+				<fmt:message key="label.course.groups.back" />
+			</button>
 		</c:otherwise>
 	</c:choose>
-	
-	<span id="titleInstructions">
-		<c:choose>
-			<c:when test="${canEdit}">
-				<fmt:message key="label.course.groups.edit.title" />
-			</c:when>
-			<c:otherwise>
-				<fmt:message key="label.course.groups.viewonly.title" />
-			</c:otherwise>
-		</c:choose>
-	</span>
 </div>
 
+<div id="titleInstructions">
+	<c:choose>
+		<c:when test="${canEdit}">
+			<fmt:message key="label.course.groups.edit.title" />
+		</c:when>
+		<c:otherwise>
+			<fmt:message key="label.course.groups.viewonly.title" />
+		</c:otherwise>
+	</c:choose>
+</div>
+
 <table id="groupsTable">
 	<tr>
 		<td id="unassignedUserCell">
@@ -119,8 +123,7 @@
 <div id="groupTemplate" class="groupContainer">
 	<div class="userContainerTitle">
 		<c:if test="${canEdit and not usedForBranching}">
-			<img class="removeGroupButton" src="<lams:LAMSURL/>images/css/delete.png"
-		    	 title="<fmt:message key='label.course.groups.remove.tooltip' />" />
+			<i class="removeGroupButton fa fa-remove fa-2x" title="<fmt:message key='label.course.groups.remove.tooltip' />" ></i>
 		</c:if>
 		<input type="text" 
 			<c:if test="${not canEdit}">
Index: lams_central/web/orgGrouping.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/orgGrouping.jsp,v
diff -u -r1.3.2.6 -r1.3.2.7
--- lams_central/web/orgGrouping.jsp	21 Jun 2016 06:19:34 -0000	1.3.2.6
+++ lams_central/web/orgGrouping.jsp	31 Oct 2016 16:16:34 -0000	1.3.2.7
@@ -7,7 +7,7 @@
 <lams:html>
 <lams:head>
 	<lams:css style="main" />
-	<link rel="stylesheet" href="css/jquery-ui-redmond-theme.css" type="text/css" media="screen" />
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" media="screen" />
 	<link rel="stylesheet" href="css/orgGrouping.css" type="text/css" media="screen" />
 	<style type="text/css">
 		div.branchMappingDialog > table {
@@ -55,7 +55,7 @@
 	<c:set var="groupingMethod" value="${usedForBranching eq true ? 'openGroupMappingDialog' : 'viewGroups'}" />
 	
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="includes/javascript/orgGrouping.js"></script>
 	<script type="text/javascript">
 		var groupingActivityId = '${param.activityID}',
@@ -100,16 +100,17 @@
 				</a> <span class="groupCount" title='<fmt:message key="label.course.groups.grouping.count.label" />'>
 					(${grouping.groupCount}) </span>
 			<c:if test="${canEdit and not lessonMode}">
-				<img class="removeGroupingButton" src="<lams:LAMSURL/>images/css/delete.png"
-						title="<fmt:message key='label.course.groups.remove.tooltip' />" onClick="javascript:removeGrouping(${grouping.groupingId})" />
+				<i class="removeGroupingButton fa fa-remove fa-lg" title="<fmt:message key='label.course.groups.remove.tooltip' />"
+				   onClick="javascript:removeGrouping(${grouping.groupingId})" ></i>
 			</c:if>
 		</div>
 	</c:if>
 </c:forEach>
 
 <c:if test="${canEdit}">
-		<div id="addGroupingButton" class="ui-button" onClick="javascript:viewGroups()">
-		<fmt:message key='label.course.groups.grouping.create' />
+		<div id="addGroupingButton" class="btn btn-default" onClick="javascript:viewGroups()">
+		<i class="fa fa-plus"></i>
+		<span><fmt:message key='label.course.groups.grouping.create' /></span>
 	</div>
 </c:if>
 	
Index: lams_central/web/css/orgGroup.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/orgGroup.css,v
diff -u -r1.3 -r1.3.2.1
--- lams_central/web/css/orgGroup.css	24 Sep 2013 13:47:21 -0000	1.3
+++ lams_central/web/css/orgGroup.css	31 Oct 2016 16:16:34 -0000	1.3.2.1
@@ -10,38 +10,31 @@
 }
 
 div#titleDiv {
-	padding: 0 5px 0 5px;
-    font-size: small;
-    font-weight: bold;
-	border-bottom: thin dotted #2E6E9E;
+	padding: 5px 0 0 5px;
 }
 
 div#titleDiv input {
-	margin: 5px 0 5px 0;
+	margin-left: 10px;
 	width: 290px;
 }
 
-div#titleDiv .ui-button {
-	margin-bottom: 5px;
-	font-size: inherit;
+div#titleDiv button {
+	margin-right: 10px;
 }
 
 #titleInstructions {
+	text-align: center;
 	margin-top: 7px;
-	float: right;
+	border-bottom: thin dotted #2E6E9E;
 }
 
-table#groupsTable {
-	height: 375px;
-}
-
 table#groupsTable td {
 	vertical-align: top;
+	padding: 5px;
 }
 
 td#unassignedUserCell {
 	width: 200px;
-	padding: 5px;
 	border-right: thin dotted #2E6E9E;
 }
 
@@ -81,8 +74,6 @@
 .removeGroupButton {
 	float: left;
 	cursor: pointer;
-	width: 16px;
-	height: 16px;
 }
 
 .userContainer {
@@ -100,7 +91,7 @@
 	margin-right: 5px;
 }
 
-.groupContainer .sortUsersButton, .groupContainer .removeGroupButton {
+.groupContainer .sortUsersButton {
 	padding-top: 3px;
 }
 
Fisheye: Tag 1.37.2.31 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/groupDisplay.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/includes/javascript/main.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/main.js,v
diff -u -r1.1.2.6 -r1.1.2.7
--- lams_central/web/includes/javascript/main.js	31 Oct 2016 13:50:02 -0000	1.1.2.6
+++ lams_central/web/includes/javascript/main.js	31 Oct 2016 16:16:34 -0000	1.1.2.7
@@ -360,27 +360,66 @@
 	});
 }
 
+function showOrgGroupingDialog(orgID, activityID) {
+	$('#dialogOrgGroup').modal('hide');
+	showDialog("dialogOrgGrouping", {
+		'width' : 460,
+		'height': 460,
+		'title' : LABELS.COURSE_GROUPS_TITLE,
+		'open' : function() {
+			// load contents after opening the dialog
+			$('iframe', this).attr('src', LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID=' + orgID
+												   + (activityID ? '&activityID=' + activityID : ''));
+		}
+	}, true);
+}
 
-function showOrgGroupDialog(orgID) {
+function showOrgGroupDialog(url) {
+	$('#dialogOrgGrouping').modal('hide');
 	showDialog("dialogOrgGroup", {
-		'data' : {
-			'orgID' : orgID
-		},
-		'modal' : true,
-		'height' : 460,
-		'width' : 'auto',
+		'width' : 850,
+		'height': 470,
 		'title' : LABELS.COURSE_GROUPS_TITLE,
 		'open' : function() {
 			// load contents after opening the dialog
-			$('iframe', this)
-					.attr('src', LAMS_URL
-						+ 'OrganisationGroup.do?method=viewGroupings&organisationID='
-						+ $(this).data('orgID'));
-			$(this).css("maxWidth", "460px").css("margin", "auto");
+			$('iframe', this).attr('src', url);
 		}
 	}, true);
 }
 
+function saveOrgGroups() {
+	var groupsSaved = saveGroups();
+	if (groupsSaved) {
+		showOrgGroupDialogContents(null, 460, 460,
+			LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID='
+			         + $('#dialogOrgGroup').data('orgID'));
+	}
+}
+
+function showOrgGroupDialogContents(title, width, height, url) {
+	var id = "dialogOrgGroup",
+		dialog = $('#' + id),
+		exists = dialog.length > 0,
+		orgID = null;
+	if (exists) {
+		if (!title) {
+			title = $('.modal-title', dialog).text();
+		}
+		orgID = dialog.data('orgID');
+	}
+	showDialog(id, {
+		'data' : {
+			'orgID'  : orgID
+		},
+		'height' : height,
+		'width'  : width,
+		'title'  : title,
+		'open'   : function() {
+			$('iframe', this).attr('src', url);
+		}
+	}, true, exists);
+}
+
 function showAddSingleActivityLessonDialog(orgID, toolID, learningLibraryID) {
 	showDialog("dialogAddSingleActivityLesson", {
 		'data' : {
Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/orgGroup.js,v
diff -u -r1.6.2.3 -r1.6.2.4
--- lams_central/web/includes/javascript/orgGroup.js	25 Apr 2016 08:30:43 -0000	1.6.2.3
+++ lams_central/web/includes/javascript/orgGroup.js	31 Oct 2016 16:16:34 -0000	1.6.2.4
@@ -24,8 +24,6 @@
 		toggleBackButton();
 	} else {
 		$('#groupingName').val(grouping.name);
-		// move Save button to the titlebar, i.e. outside of this iframe to the enveloping dialog
-		$('div.ui-dialog-titlebar', window.parent.document).append($('.customDialogButton'));
 	}
 	
 	if (canEdit) {
@@ -398,15 +396,14 @@
 		return false;
 	}
 	
-	var groupsSaved = false;
 	var newGrouping = {
 			'groupingId' : grouping.groupingId,
 			'name' : groupingName,
 			'groups' : []
 	};
 	groupContainers.each(function(){
-		var groupId = $(this).attr('groupId');
-		var users = $('div.draggableUser', this);
+		var groupId = $(this).attr('groupId'),
+			users = $('div.draggableUser', this);
 		if (!groupId && users.length == 0) {
 			return true;
 		}
@@ -435,11 +432,9 @@
 		},
 		type : 'POST',
 		success : function() {
-			groupsSaved = true;
+			window.parent.showOrgGroupingDialog(organisationId);
 		}
 	});
-	
-	return groupsSaved;
 }
 
 /**
@@ -486,18 +481,7 @@
  * If there are any existing (not new) groups, forbid going back to grouping list.
  */
 function toggleBackButton() {
-	if (lessonMode) {
-		var backButton = $('#backButton');
-		var disabled = $('.groupContainer[groupId]').length > 0;
-		if (disabled) {
-			backButton.off('click').button('option', 'disabled', true);
-		} else {
-			backButton.click(function(){
-				document.location.href = LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&activityID='
-					+ groupingActivityId + '&organisationID=' + grouping.organisationId;
-			}).button('option', 'disabled', false);
-		}
-	}
+	$('#backButton').prop('disabled', $('.groupContainer[groupId]').length == 0);
 }
 
 /**
Index: lams_central/web/includes/javascript/orgGrouping.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/orgGrouping.js,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_central/web/includes/javascript/orgGrouping.js	17 Jun 2016 11:19:03 -0000	1.2.2.3
+++ lams_central/web/includes/javascript/orgGrouping.js	31 Oct 2016 16:16:34 -0000	1.2.2.4
@@ -1,9 +1,5 @@
 var gtbDialog = null;
 
-$(document).ready(function() {
-	$(".ui-button").button();
-});
-
 function removeGrouping(groupingId) {
 	if (!lessonMode && confirm(LABELS.REMOVE_GROUPING_CONFIRM_LABEL)) {
 		document.location.href = "OrganisationGroup.do?method=removeGrouping&organisationID="
@@ -12,8 +8,7 @@
 }
 
 function viewGroups(groupingId, force) {
-	var url = LAMS_URL + 'OrganisationGroup.do?method=viewGroups&organisationID='
-		+ organisationId;
+	var url = LAMS_URL + 'OrganisationGroup.do?method=viewGroups&organisationID=' + organisationId;
 	if (lessonId) {
 		url += '&lessonID=' + lessonId;
 	}
@@ -35,7 +30,7 @@
 		}
 	} else {
 		// load to dialog
-		window.parent.showOrgGroupDialogContents(null, 880, 500, url);
+		window.parent.showOrgGroupDialog(url);
 	}
 }
 /**
Index: lams_central/web/signup/singupTab.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/signup/singupTab.jsp,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_central/web/signup/singupTab.jsp	28 Oct 2016 06:10:02 -0000	1.3.2.2
+++ lams_central/web/signup/singupTab.jsp	31 Oct 2016 16:16:34 -0000	1.3.2.3
@@ -15,8 +15,6 @@
 <script type="text/javascript"
 	src="/lams/includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript"
-	src="/lams/includes/javascript/groupDisplay.js"></script>
-<script type="text/javascript"
 	src="/lams/includes/javascript/jquery.validate.js"></script>