Index: lams_admin/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_admin/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_central/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_central/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_gradebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_gradebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_learning/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_learning/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_monitoring/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_monitoring/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_assessment/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_assessment/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_bbb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_bbb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_chat/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_chat/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_daco/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_daco/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_forum/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_forum/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_gmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_gmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_images/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_images/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_imscc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_imscc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_kaltura/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_kaltura/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_lamc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_lamc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_laqa/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_laqa/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_larsrc/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_larsrc/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_leader/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_leader/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_mindmap/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_mindmap/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
@@ -293,7 +299,6 @@
 				<div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1">
 					<ul class="nav navbar-nav">
 						<li>
-
 							<c:if test="${displayPortrait}">
 								<a id="navbar-portrait" href="#" onclick="javascript:showMyPortraitDialog(); return false;">
 									<c:set var="userId"><lams:user property="userID" /></c:set>
Index: lams_tool_nb/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_nb/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_notebook/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_notebook/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_pixlr/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_pixlr/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_sbmt/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_sbmt/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_scratchie/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_scratchie/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_scribe/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_scribe/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_survey/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_survey/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_task/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_task/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_vote/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_vote/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_tool_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>
Index: lams_www/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r9854a395461bf77e72934605a08a95b73ce8e12b -rfe29484b119222b63a74e3cdeebd7f25d82d5507
--- lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 9854a395461bf77e72934605a08a95b73ce8e12b)
+++ lams_www/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision fe29484b119222b63a74e3cdeebd7f25d82d5507)
@@ -51,7 +51,13 @@
 	
 		<%-- Links placed in body instead of head. Ugly, but it works. --%>
 		<lams:css suffix="progressBar"/>
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"></script>
+		<script type="text/javascript">
+			// Adding jquery-ui.js if it hasn't been loaded already
+			jQuery.ui || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+		
+			// Adding bootstrap.js if it hasn't been loaded already
+			(typeof($.fn.modal) != 'undefined') || document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"><\/script>');
+		</script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/dialog.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/snap.svg.js"></script>
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/progressBar.js"></script>