Index: lams_build/lib/lams/lams-gradebook.jar
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r933daa10940c5b2d5f028e370eb8d581cd71f50b
Binary files differ
Index: lams_build/lib/lams/lams-learning.jar
===================================================================
diff -u -rb546f3a46de916721f4d729ac1b0e64cc1eb9cb4 -r933daa10940c5b2d5f028e370eb8d581cd71f50b
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r933daa10940c5b2d5f028e370eb8d581cd71f50b
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 933daa10940c5b2d5f028e370eb8d581cd71f50b)
@@ -184,7 +184,7 @@
 		    : "/" + serverURLContextPath;
 	    serverURLContextPath += serverURLContextPath.endsWith("/") ? "" : "/";
 	    getServlet().getServletContext().getContext(serverURLContextPath + "learning")
-		    .getRequestDispatcher("/content.do?lessonID=" + lessonId).forward(req, res);
+		    .getRequestDispatcher("/welcome.jsp?lessonID=" + lessonId).forward(req, res);
 	    return null;
 
 	} catch (Exception e) {
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r933daa10940c5b2d5f028e370eb8d581cd71f50b
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java	(.../GradebookLearningController.java)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookLearningController.java	(.../GradebookLearningController.java)	(revision 933daa10940c5b2d5f028e370eb8d581cd71f50b)
@@ -63,10 +63,10 @@
 
     @RequestMapping("")
     public String unspecified() throws Exception {
-	return null;
+	return "gradebookCourseLearner";
     }
 
-    @RequestMapping
+    @RequestMapping("/courseLearner")
     public String courseLearner(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	try {
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r933daa10940c5b2d5f028e370eb8d581cd71f50b
--- lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_gradebook/web/gradebookCourseLearner.jsp	(.../gradebookCourseLearner.jsp)	(revision 933daa10940c5b2d5f028e370eb8d581cd71f50b)
@@ -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,
@@ -74,7 +74,7 @@
 							 iconSet: 'fontAwesome',
 							 autoencode:false,
 						     datatype: "xml",
-						     url: "<lams:LAMSURL />/gradebook/gradebook/getActivityGridData.do?view=lrnActivity&lessonID=" + lessonID,
+						     url: "<lams:LAMSURL />gradebook/gradebook/getActivityGridData.do?view=lrnActivity&lessonID=" + lessonID,
 						     height: "100%",
 						     autowidth:true,
 						     pager: subgrid_table_id + "_pager",