Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -r72d525026e011d4ac75686e07377a4242c3eb09f -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 72d525026e011d4ac75686e07377a4242c3eb09f)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -15,7 +15,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	
 </lams:head>
     
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d3c74d54fc59c736099961fb33d9d1dd30263d0 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d3c74d54fc59c736099961fb33d9d1dd30263d0)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -554,7 +554,7 @@
 authoring.fla.page.menu.flow = Flow
 authoring.fla.page.menu.flow.gate = Gate
 authoring.fla.page.menu.flow.branch = Branch
-authoring.fla.page.menu.group = Group
+authoring.fla.page.menu.group = Grouping
 authoring.fla.page.menu.annotate = Annotate
 authoring.fla.page.menu.annotate.label = Label
 authoring.fla.page.menu.annotate.region = Region
@@ -629,6 +629,14 @@
 authoring.fla.liveedit.readonly.remove.parent.error = The activity can not be removed. Its parent activity is read-only.
 authoring.fla.liveedit.readonly.remove.child.error = The activity can not be removed. It has read-only child activities.
 authoring.fla.liveedit.readonly.remove.transition.error = The transition can not be removed. It is read-only.
+authoring.fla.tool.category.1 = Flow
+authoring.fla.tool.category.2 = Collaboration
+authoring.fla.tool.category.3 = Assessment
+authoring.fla.tool.category.4 = Content
+authoring.fla.tool.category.5 = Combined
+authoring.fla.tool.category.6 = Reflective
+authoring.fla.tool.category.expand = Expand / collapse all activity categories
+authoring.fla.tool.bar.expand = Hide / show activity toolbar
 ckeditor.math.math = Math
 ckeditor.math.functions = Functions
 ckeditor.math.greek = Greek
Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -r2d3c74d54fc59c736099961fb33d9d1dd30263d0 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 2d3c74d54fc59c736099961fb33d9d1dd30263d0)
+++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -554,7 +554,6 @@
 authoring.fla.page.menu.flow = Ροή
 authoring.fla.page.menu.flow.gate = Πύλη
 authoring.fla.page.menu.flow.branch = Κλάδος
-authoring.fla.page.menu.group = Ομάδα
 authoring.fla.page.menu.annotate = Σχολιασμός
 authoring.fla.page.menu.annotate.label = Ετικέτα
 authoring.fla.page.menu.annotate.region = Περιοχή
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r2d3c74d54fc59c736099961fb33d9d1dd30263d0 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 2d3c74d54fc59c736099961fb33d9d1dd30263d0)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -554,7 +554,6 @@
 authoring.fla.page.menu.flow = Flow
 authoring.fla.page.menu.flow.gate = Gate
 authoring.fla.page.menu.flow.branch = Branch
-authoring.fla.page.menu.group = Group
 authoring.fla.page.menu.annotate = Annotate
 authoring.fla.page.menu.annotate.label = Label
 authoring.fla.page.menu.annotate.region = Region
Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -r2d3c74d54fc59c736099961fb33d9d1dd30263d0 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 2d3c74d54fc59c736099961fb33d9d1dd30263d0)
+++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -554,7 +554,6 @@
 authoring.fla.page.menu.flow = Flujo
 authoring.fla.page.menu.flow.gate = Puerta
 authoring.fla.page.menu.flow.branch = Ramificación
-authoring.fla.page.menu.group = Grupos
 authoring.fla.page.menu.annotate = Anotaciones
 authoring.fla.page.menu.annotate.label = Etiqueta
 authoring.fla.page.menu.annotate.region = Región
Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r2d3c74d54fc59c736099961fb33d9d1dd30263d0 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 2d3c74d54fc59c736099961fb33d9d1dd30263d0)
+++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -554,7 +554,6 @@
 authoring.fla.page.menu.flow = Flyt
 authoring.fla.page.menu.flow.gate = Port
 authoring.fla.page.menu.flow.branch = Gren
-authoring.fla.page.menu.group = Gruppe
 authoring.fla.page.menu.annotate = Kommentere
 authoring.fla.page.menu.annotate.label = Mertkelapp
 authoring.fla.page.menu.annotate.region = Område
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
===================================================================
diff -u -rd40c2f2f11ceb1086c32f47220853b58541a7100 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision d40c2f2f11ceb1086c32f47220853b58541a7100)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java	(.../AuthoringController.java)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -51,8 +51,6 @@
 import org.lamsfoundation.lams.learningdesign.BranchingActivity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.LearningDesignAccess;
-import org.lamsfoundation.lams.learningdesign.LearningLibrary;
-import org.lamsfoundation.lams.learningdesign.LearningLibraryGroup;
 import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO;
 import org.lamsfoundation.lams.learningdesign.dto.LearningDesignDTO;
 import org.lamsfoundation.lams.learningdesign.dto.ValidationErrorDTO;
@@ -88,7 +86,6 @@
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -134,18 +131,6 @@
 	request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, FileUtil.generateUniqueContentFolderID());
 
 	request.setAttribute("tools", learningDesignService.getToolDTOs(true, true, request.getRemoteUser()));
-	// build list of existing learning library groups
-	List<LearningLibraryGroup> groups = learningDesignService.getLearningLibraryGroups();
-	ArrayNode groupsJSON = JsonNodeFactory.instance.arrayNode();
-	for (LearningLibraryGroup group : groups) {
-	    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
-	    groupJSON.put("name", group.getName());
-	    for (LearningLibrary learningLibrary : group.getLearningLibraries()) {
-		groupJSON.withArray("learningLibraries").add(learningLibrary.getLearningLibraryId());
-	    }
-	    groupsJSON.add(groupJSON);
-	}
-	request.setAttribute("learningLibraryGroups", groupsJSON.toString());
 
 	List<LearningDesignAccess> accessList = authoringService.updateLearningDesignAccessByUser(getUserId());
 	request.setAttribute("access", JsonUtil.toString(accessList));
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -r45253ccd280463e84a285c845333ad81d8a10ebe -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 45253ccd280463e84a285c845333ad81d8a10ebe)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -18,13 +18,13 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/learning-design-treeview.js" ></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringGeneral.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringActivity.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringDecoration.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringProperty.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringHandler.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/authoring/authoringMenu.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />	
+	<lams:JSImport src="includes/javascript/authoring/authoringGeneral.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringActivity.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringDecoration.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringProperty.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringHandler.js" />
+	<lams:JSImport src="includes/javascript/authoring/authoringMenu.js" />
 	<script type="text/javascript">
 		var LAMS_URL = '<lams:LAMSURL/>',
 			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home/getLearningDesignThumbnail.do?ldId=',
Index: lams_central/web/includes/javascript/portrait.js
===================================================================
diff -u -rf53f23916969b65b3bc88655d59d37f6105a4b42 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_central/web/includes/javascript/portrait.js	(.../portrait.js)	(revision f53f23916969b65b3bc88655d59d37f6105a4b42)
+++ lams_central/web/includes/javascript/portrait.js	(.../portrait.js)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -88,6 +88,8 @@
 	
 	if ( ! placement )
 		placement = 'right';
+		
+	placement = 'auto ' + placement;
 	
 	$('.new-popover').each(function( index, element ) {
 		if ( ! element.dataset ) {
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rce46e7236188aeb13a7b1d70e5a9cb2b42b4d967 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ce46e7236188aeb13a7b1d70e5a9cb2b42b4d967)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -244,7 +244,6 @@
 force.complete.end.lesson.tooltip = To move learner to the end of lesson, drag them over to this bar.
 learner.group.count = learners in total.
 learner.group.show = Double-click for full list
-learner.finished.count = Finished Learners: [0] of [1]
 learner.finished.dialog.title = End of lesson
 learner.group.sort.button = Sort
 button.force.complete = Move selected learners to...
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r56209f294891d58820dfb5022daafdc7bdac4cbb -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 56209f294891d58820dfb5022daafdc7bdac4cbb)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -219,7 +219,7 @@
 			};
 	</script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
-	<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/monitorLesson.js"></script>
+	<lams:JSImport src="includes/javascript/monitorLesson.js" relative="true" />
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
@@ -229,7 +229,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-tourist.min.js"></script> 
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+	<lams:JSImport src="includes/javascript/dialog.js" />
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
 	<script type="text/javascript">
Index: lams_monitoring/web/tblmonitor/sequence.jsp
===================================================================
diff -u -r54613e14332031bce49e424b8e0ebc3700a2ccd7 -re49f4ca2772f41c3e5dce498bc2d32a66b4f31ad
--- lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision 54613e14332031bce49e424b8e0ebc3700a2ccd7)
+++ lams_monitoring/web/tblmonitor/sequence.jsp	(.../sequence.jsp)	(revision e49f4ca2772f41c3e5dce498bc2d32a66b4f31ad)
@@ -25,14 +25,14 @@
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/readmore.min.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
-<script type="text/javascript" src="<lams:WebAppURL/>includes/javascript/monitorLesson.js"></script>
+<lams:JSImport src="includes/javascript/monitorLesson.js" relative="true" />
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
 <script>
 
 </script>
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.tabcontroller.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap-tourist.min.js"></script> 
-<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
+<lams:JSImport src="includes/javascript/dialog.js" />
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/portrait.js"></script>
 <script>
 	//avoid name clash between bootstrap and jQuery UI