Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java	(.../GradebookController.java)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java	(.../GradebookController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -80,23 +80,23 @@
 
     @Autowired
     @Qualifier("gradebookService")
-    private static IGradebookService gradebookService;
+    private  IGradebookService gradebookService;
 
     @Autowired
-    @Qualifier("userService")
-    private static IUserManagementService userService;
+    @Qualifier("userManagementService")
+    private  IUserManagementService userService;
 
     @Autowired
     @Qualifier("lessonService")
-    private static ILessonService lessonService;
+    private  ILessonService lessonService;
 
     @Autowired
     @Qualifier("securityService")
-    private static ISecurityService securityService;
+    private  ISecurityService securityService;
 
     @Autowired
     @Qualifier("learnerService")
-    private static ICoreLearnerService learnerService;
+    private  ICoreLearnerService learnerService;
 
     @RequestMapping("")
     @ResponseBody
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java
===================================================================
diff -u -r933daa10940c5b2d5f028e370eb8d581cd71f50b -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java	(.../GradebookLearningController.java)	(revision 933daa10940c5b2d5f028e370eb8d581cd71f50b)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java	(.../GradebookLearningController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -54,12 +54,12 @@
     private static Logger logger = Logger.getLogger(GradebookLearningController.class);
 
     @Autowired
-    @Qualifier("userService")
-    private static IUserManagementService userService;
+    @Qualifier("userManagementService")
+    private IUserManagementService userService;
 
     @Autowired
     @Qualifier("securityService")
-    private static ISecurityService securityService;
+    private ISecurityService securityService;
 
     @RequestMapping("")
     public String unspecified() throws Exception {
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java	(.../GradebookMonitoringController.java)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java	(.../GradebookMonitoringController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -80,19 +80,19 @@
 
     @Autowired
     @Qualifier("gradebookService")
-    private static IGradebookService gradebookService;
+    private IGradebookService gradebookService;
 
     @Autowired
-    @Qualifier("userService")
-    private static IUserManagementService userService;
+    @Qualifier("userManagementService")
+    private IUserManagementService userService;
 
     @Autowired
     @Qualifier("lessonService")
-    private static ILessonService lessonService;
+    private ILessonService lessonService;
 
     @Autowired
     @Qualifier("securityService")
-    private static ISecurityService securityService;
+    private ISecurityService securityService;
 
     @RequestMapping("")
     public String unspecified(HttpServletRequest request, HttpServletResponse response) throws Exception {
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
diff -u -r933daa10940c5b2d5f028e370eb8d581cd71f50b -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision 933daa10940c5b2d5f028e370eb8d581cd71f50b)
+++ lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -25,7 +25,7 @@
 				autoencode:false,
 				caption: "${organisationName}",
 			    datatype: "xml",
-			    url: "<lams:LAMSURL />gradebook/gradebook/getCourseGridData.do?view='lrnCourse'&organisationID='${organisationID}'",
+			    url: "<lams:LAMSURL />gradebook/gradebook/getCourseGridData.do?view=lrnCourse&organisationID=${organisationID}",
 				height: 'auto',
 				width: $(window).width() - 100,
 				shrinkToFit: false,
Index: lams_gradebook/web/gradebookCourseMonitor.jsp
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/gradebookCourseMonitor.jsp	(.../gradebookCourseMonitor.jsp)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -59,7 +59,7 @@
 				autoencode:false,
 				caption: "<fmt:message key="gradebook.gridtitle.lesson.view"/>",
 			    datatype: "xml",
-			    url: "<lams:LAMSURL />/gradebook/gradebook/getCourseGridData.do?view=monCourse&organisationID=${organisationID}",
+			    url: "<lams:LAMSURL />gradebook/gradebook/getCourseGridData.do?view=monCourse&organisationID=${organisationID}",
 			    height: "100%",
 			    width: jqgridWidth,
 				shrinkToFit: false,
@@ -191,7 +191,7 @@
 				autoencode:false,
 				caption: "<fmt:message key="gradebook.gridtitle.learner.view"/>",
 			    datatype: "xml",
-			    url: "<lams:LAMSURL />/gradebook/gradebook/getUserGridData.do?view=listView&organisationID=${organisationID}",
+			    url: "<lams:LAMSURL />gradebook/gradebook/getUserGridData.do?view=listView&organisationID=${organisationID}",
 			    height: "100%",
 			    width: jqgridWidth,
 			    shrinkToFit: false,
@@ -225,7 +225,7 @@
 							 iconSet: 'fontAwesome',
 							 autoencode:false,
 						     datatype: "xml",
-						     url: "<lams:LAMSURL />/gradebook/gradebook/getCourseGridData.do?view=monUserView&organisationID=${organisationID}&userID=" + userID,
+						     url: "<lams:LAMSURL />gradebook/gradebook/getCourseGridData.do?view=monUserView&organisationID=${organisationID}&userID=" + userID,
 						     height: "100%",
 						     autowidth:true,
 						     cellEdit:true,
@@ -349,7 +349,7 @@
 			
 			$("#export-course-button").click(function() {
 				var areaToBlock = "export-link-area";
-				var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring/exportExcelCourseGradebook.do?organisationID=${organisationID}";
+				var exportExcelUrl = "<lams:WebAppURL/>gradebookMonitoring/exportExcelCourseGradebook.do?organisationID=${organisationID}";
 				blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait);
 				
 				return false;
@@ -368,7 +368,7 @@
 					var areaToBlock = "select-lessons-area";
 					var simplified = jQuery("#export-selected-simplified").prop('checked');
 					simplified = "&simplified="+simplified;
-					var exportExcelUrl = "<lams:WebAppURL/>/gradebookMonitoring/exportExcelSelectedLessons"+simplified+".do?organisationID=${organisationID}" + lessonIds;
+					var exportExcelUrl = "<lams:WebAppURL/>gradebookMonitoring/exportExcelSelectedLessons"+simplified+".do?organisationID=${organisationID}" + lessonIds;
 					blockExportButton(areaToBlock, exportExcelUrl, languageLabelWait);
 				}
 				
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ActivityController.java
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ActivityController.java	(.../ActivityController.java)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ActivityController.java	(.../ActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.learning.web.controller;
 
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
-import org.lamsfoundation.lams.web.action.LamsAction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
@@ -36,7 +35,7 @@
  */
 @Controller
 @RequestMapping("/activity")
-public abstract class ActivityController{
+public abstract class ActivityController {
 
     public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java	(.../ChooseActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java	(.../ChooseActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -51,12 +51,14 @@
  *
  */
 @Controller
-public class ChooseActivityController extends ActivityController {
+public class ChooseActivityController {
 
     protected static String className = "ChooseActivity";
 
     private static Logger log = Logger.getLogger(ChooseActivityController.class);
 
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
+
     @Autowired
     @Qualifier("learnerService")
     private ICoreLearnerService learnerService;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java	(.../CompleteActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java	(.../CompleteActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -57,13 +57,15 @@
  *
  */
 @Controller
-public class CompleteActivityController extends ActivityController {
+public class CompleteActivityController {
 
     private static Logger log = Logger.getLogger(CompleteActivityController.class);
 
     protected static String className = "CompleteActivity";
     private static IntegrationService integrationService = null;
 
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
+
     @Autowired
     @Qualifier("learnerService")
     private ICoreLearnerService learnerService;
@@ -81,8 +83,8 @@
      * @throws ServletException
      */
     @RequestMapping("/CompleteActivity")
-    public String execute(@ModelAttribute("messageForm") ActivityForm messageForm, HttpServletRequest request, HttpServletResponse response)
-	    throws IOException, ServletException {
+    public String execute(@ModelAttribute("messageForm") ActivityForm messageForm, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
 	ActivityMapping actionMappings = LearningWebUtil
 		.getActivityMapping(this.applicationContext.getServletContext());
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java	(.../DisplayActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java	(.../DisplayActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -64,13 +64,15 @@
  *
  */
 @Controller
-public class DisplayActivityController extends ActivityController {
+public class DisplayActivityController {
 
     //---------------------------------------------------------------------
     // Instance variables
     //---------------------------------------------------------------------
     private static Logger log = Logger.getLogger(DisplayActivityController.class);
 
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
+
     public static final String PARAM_INITIAL_DISPLAY = "initialDisplay";
 
     @Autowired
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java	(.../DisplayOptionsActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -63,10 +63,12 @@
  *
  */
 @Controller
-public class DisplayOptionsActivityController extends ActivityController {
+public class DisplayOptionsActivityController {
 
     private static Logger log = Logger.getLogger(DisplayOptionsActivityController.class);
 
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
+
     @Autowired
     @Qualifier("learnerService")
     private ICoreLearnerService learnerService;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java	(.../DisplayParallelActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayParallelActivityController.java	(.../DisplayParallelActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -59,10 +59,12 @@
  *
  */
 @Controller
-public class DisplayParallelActivityController extends ActivityController {
+public class DisplayParallelActivityController {
 
     private static Logger log = Logger.getLogger(DisplayParallelActivityController.class);
 
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
+
     @Autowired
     @Qualifier("learnerService")
     private ICoreLearnerService learnerService;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java	(.../DisplayToolActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/DisplayToolActivityController.java	(.../DisplayToolActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -50,9 +50,10 @@
  *
  */
 @Controller
-public class DisplayToolActivityController extends ActivityController {
+public class DisplayToolActivityController {
 
     private static Logger log = Logger.getLogger(DisplayToolActivityController.class);
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
 
     @Autowired
     @Qualifier("learnerService")
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(.../LearnerController.java)	(revision b546f3a46de916721f4d729ac1b0e64cc1eb9cb4)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -57,7 +57,7 @@
 import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
+import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.MessageService;
@@ -106,7 +106,8 @@
     private ICoreLearnerService learnerService;
 
     @Autowired
-    private UserManagementService userManagementService;
+    @Qualifier("userManagementService")
+    private IUserManagementService userManagementService;
 
     @Autowired
     @Qualifier("gradebookService")
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java	(.../LessonCompleteActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java	(.../LessonCompleteActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -45,8 +45,10 @@
  * Action class run when the learner finishes a lesson.
  */
 @Controller
-public class LessonCompleteActivityController extends ActivityController {
+public class LessonCompleteActivityController {
 
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
+
     @Autowired
     @Qualifier("learnerService")
     private ICoreLearnerService learnerService;
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java	(.../LoadToolActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java	(.../LoadToolActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -60,9 +60,10 @@
  *
  */
 @Controller
-public class LoadToolActivityController extends ActivityController {
+public class LoadToolActivityController {
 
     private static Logger log = Logger.getLogger(LoadToolActivityController.class);
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
 
     @Autowired
     @Qualifier("learnerService")
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
===================================================================
diff -u -r1f7150d6142f994d113ba543736a9f7c0e154337 -r1704c05d7e844f968d3700990957ff05f3611ba5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java	(.../SequenceActivityController.java)	(revision 1f7150d6142f994d113ba543736a9f7c0e154337)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java	(.../SequenceActivityController.java)	(revision 1704c05d7e844f968d3700990957ff05f3611ba5)
@@ -53,9 +53,10 @@
  *
  */
 @Controller
-public class SequenceActivityController extends ActivityController {
+public class SequenceActivityController {
 
     private static Logger log = Logger.getLogger(SequenceActivityController.class);
+    public static final String RELEASED_LESSONS_REQUEST_ATTRIBUTE = "releasedLessons";
 
     @Autowired
     @Qualifier("learnerService")