Index: lams_build/lib/lams/lams-central.jar
===================================================================
diff -u -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23 -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
Binary files differ
Index: lams_central/.classpath
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/.classpath	(.../.classpath)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/.classpath	(.../.classpath)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
@@ -43,5 +42,6 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/collections/main/commons-collections-3.2.2.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(.../HomeController.java)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -93,8 +93,7 @@
     @Qualifier("learningDesignService")
     private ILearningDesignService learningDesignService;
     @Autowired
-    @Qualifier("learningDesignService")
-    private static IGroupUserDAO groupUserDAO;
+    private IGroupUserDAO groupUserDAO;
     @Autowired
     @Qualifier("workspaceManagementService")
     private IWorkspaceManagementService workspaceManagementService;
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -rd0a8679bc756e47321aff67f3ed1eb737b8535ff -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision d0a8679bc756e47321aff67f3ed1eb737b8535ff)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -472,7 +472,7 @@
 			console.log("width "+$(window).width()+":"+Math.max(380, Math.min(955, $(window).width() - 60)));
 			// load contents after opening the dialog
 			$('iframe', this).attr('src', LAMS_URL
-				+ 'gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID=' + orgID);
+				+ 'gradebook/gradebookMonitoring/courseMonitor.do?organisationID=' + orgID);
 		}
 	}, true);
 }
@@ -508,7 +508,7 @@
 			var lessonID = $(this).data('lessonID');
 			// load contents after opening the dialog
 			$('iframe', this).attr('src', LAMS_URL
-				+ 'lessonConditions.do?method=getIndexLessonConditions&lsId=' + lessonID);
+				+ 'lessonConditions/getIndexLessonConditions.do?lsId=' + lessonID);
 		}
 	}, true);
 }
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r33f9914fba416faeaa89be285fa2cd182c4d29ed -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision 33f9914fba416faeaa89be285fa2cd182c4d29ed)
+++ lams_central/web/includes/javascript/openUrls.js	(.../openUrls.js)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -61,32 +61,32 @@
 }
 
 function returnToMonitorLessonIntegrated( lessonID ) {
-	window.location = 'home/monitorLesson.do?lessonID='+lessonID;
+	window.location = '../home/monitorLesson.do?lessonID='+lessonID;
 }
 
 function openMonitorLesson( lessonID ) {
 	if (isMac) {
 		if(belowMinRes) {
-			monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+ lessonID,'mWindow','width=' + monitor_width 
+			monitorLessonWin = window.open('../home/monitorLesson.do?lessonID='+ lessonID,'mWindow','width=' + monitor_width 
 							   + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
 		} else {
-			monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
+			monitorLessonWin = window.open('../home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
 							   + ',height=' + monitor_height + ',resizable,scrollbars' + getCenterParams(monitor_width, monitor_height));
 		}
 	} else {
 		if (monitorLessonWin && !monitorLessonWin.closed) {
-			monitorLessonWin.location = 'home/monitorLesson.do?lessonID='+lessonID;
+			monitorLessonWin.location = '../home/monitorLesson.do?lessonID='+lessonID;
 			monitorLessonWin.focus();
 		} else {
-			monitorLessonWin = window.open('home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
+			monitorLessonWin = window.open('../home/monitorLesson.do?lessonID='+lessonID,'mWindow','width=' + monitor_width
 							   + ',height=' + monitor_height + ',resizable,resizable,scrollbars'
 							   + getCenterParams(monitor_width, monitor_height));
 		}
 	}
 }
 
 function openLearner( lessonId ) {
-	var learnerUrl = 'home/learner.do?lessonID=' + lessonId;
+	var learnerUrl = '../home/learner.do?lessonID=' + lessonId;
 	
 	if (isMac) {
 		learnWin = window.open(learnerUrl,'lWindow','width=' + learner_width + ',height=' + learner_height 
Index: lams_central/web/indexLessonConditions.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/indexLessonConditions.jsp	(.../indexLessonConditions.jsp)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -3,16 +3,14 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-function" prefix="fn"%>
-
+<c:set var="lams"><lams:LAMSURL/></c:set>
 <!DOCTYPE html>
 <lams:html>
 <lams:head>
-	<c:url value="/lessonConditions.do" var="addLessonDependencyUrl">
-		<c:param name="method" value="addLessonDependency" />
+	<c:url value="/lessonConditions/addLessonDependency.do" var="addLessonDependencyUrl">
 		<c:param name="lsId" value="${lsId}" />
 	</c:url>
-	<c:url value="/lessonConditions.do" var="setDaysToLessonFinishUrl">
-		<c:param name="method" value="setDaysToLessonFinish" />
+	<c:url value="/lessonConditions/setDaysToLessonFinish.do" var="setDaysToLessonFinishUrl">
 		<c:param name="lsId" value="${lsId}" />
 	</c:url>
 	
@@ -27,13 +25,13 @@
 		}
 	</style>
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript">
 		var lessonId="${lsId}";
 		var edit="${edit}";
 		
 		function removePrecedingLesson(precedingLessonId){
-			document.location.href="<lams:LAMSURL/>lessonConditions.do?method=removeLessonDependency&lsId=" + lessonId
+			document.location.href="<lams:LAMSURL/>lessonConditions/removeLessonDependency.do?lsId=" + lessonId
 						  + "&precedingLessonId=" + precedingLessonId;
 		}
 
Index: lams_central/web/lessonIntro.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/lessonIntro.jsp	(.../lessonIntro.jsp)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -13,7 +13,7 @@
 	<TITLE><fmt:message key="title.learner.window"/></TITLE>
 	<lams:css/>
 	
-	<script type="text/javascript" src="includes/javascript/jquery.js"></script>	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>	
 	<c:if test="${displayDesignImage}">
 		<script>
 		var originalThumbnailWidth = 0,
Index: lams_central/web/profile.jsp
===================================================================
diff -u -r52f09d3d3dd6998ff9cb9e7377c7501341ad7a23 -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision 52f09d3d3dd6998ff9cb9e7377c7501341ad7a23)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -46,15 +46,15 @@
 							</c:when>
 							<c:otherwise>
 								<img style="margin: 0 auto;" class="img-circle img-responsive"
-									title="<c:out value='fullName' />"
-									src="/lams/download/?uuid=<c:out value="portraitUuid" />&version=2&preferDownload=false" />
+									title="<c:out value='${fullName}' />"
+									src="/lams/download/?uuid=<c:out value="${portraitUuid}" />&version=2&preferDownload=false" />
 							</c:otherwise>
 						</c:choose>
 
 						<p class="text-center">
-							<c:out value="fullName" />
+							<c:out value="${fullName}" />
 								<br /> <i class="fa fa-envelope small"></i>
-							<c:out value="email" />
+							<c:out value="${email}" />
 						</p>
 					</div>
 					<hr>
Index: lams_central/web/twoFactorAuthSecret.jsp
===================================================================
diff -u -r0e9eca8da006863730e793b75a47803bc6142c67 -rb7aef118db71bf93f74bf91c76fbd4e59de37dff
--- lams_central/web/twoFactorAuthSecret.jsp	(.../twoFactorAuthSecret.jsp)	(revision 0e9eca8da006863730e793b75a47803bc6142c67)
+++ lams_central/web/twoFactorAuthSecret.jsp	(.../twoFactorAuthSecret.jsp)	(revision b7aef118db71bf93f74bf91c76fbd4e59de37dff)
@@ -53,7 +53,7 @@
 					<div class="form-group voffset10">
 						<div class="col-sm-12 controls">
 							<input type="submit" class="btn btn-default pull-right" value="Ok"
-								onClick="javascript:document.location='index.do';" tabindex="1"/>
+								onClick="javascript:document.location='<lams:LAMSURL/>index.do';" tabindex="1"/>
 						</div>	
 					</div>
 			</div>