Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AuthoringController.java
===================================================================
diff -u -rd1b5adfc103345fa2525236c53313dcda1cfb7c0 -r645056c136b15a368e557dd13ea7154b0eea48a2
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision d1b5adfc103345fa2525236c53313dcda1cfb7c0)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/AuthoringController.java	(.../AuthoringController.java)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
@@ -143,6 +143,7 @@
      * @throws WhiteboardApplicationException
      */
 
+    @SuppressWarnings("unchecked")
     @RequestMapping("/init")
     private String initPage(@ModelAttribute("authoringForm") WhiteboardForm authoringForm, HttpServletRequest request)
 	    throws ServletException, WhiteboardApplicationException {
Index: lams_tool_whiteboard/web/pages/authoring/basic.jsp
===================================================================
diff -u -raaca6909ba7c5e49aca4225b7ebc02e94759e15a -r645056c136b15a368e557dd13ea7154b0eea48a2
--- lams_tool_whiteboard/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision aaca6909ba7c5e49aca4225b7ebc02e94759e15a)
+++ lams_tool_whiteboard/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
@@ -18,6 +18,6 @@
 
 <c:if test="${not empty whiteboardServerUrl}">
 	<iframe id="whiteboard-frame"
-	        src='${whiteboardServerUrl}?whiteboardid=${authoringForm.whiteboard.contentId}&username=${authoringForm.authorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}'>
+	        src='${whiteboardServerUrl}/?whiteboardid=${authoringForm.whiteboard.contentId}&username=${authoringForm.authorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}'>
 	</iframe>
 </c:if>
\ No newline at end of file
Index: lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp
===================================================================
diff -u -rca513921e11b276f0c7237b742cf916c42536532 -r645056c136b15a368e557dd13ea7154b0eea48a2
--- lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision ca513921e11b276f0c7237b742cf916c42536532)
+++ lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(.../galleryWalk.jsp)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
@@ -169,7 +169,7 @@
 		       	    </c:if>
 		 
 					<iframe class="whiteboard-frame"
-							data-src='${whiteboardServerUrl}?whiteboardid=${groupSummary.wid}&username=${whiteboardAuthorName}${empty groupSummary.accessToken ? "" : "&accesstoken=".concat(groupSummary.accessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(groupSummary.copyAccessToken)}'>
+							data-src='${whiteboardServerUrl}/?whiteboardid=${groupSummary.wid}&username=${whiteboardAuthorName}${empty groupSummary.accessToken ? "" : "&accesstoken=".concat(groupSummary.accessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(groupSummary.copyAccessToken)}'>
 					</iframe>	
 				</div>
 			</div>
Index: lams_tool_whiteboard/web/pages/learning/learning.jsp
===================================================================
diff -u -rd1b5adfc103345fa2525236c53313dcda1cfb7c0 -r645056c136b15a368e557dd13ea7154b0eea48a2
--- lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d1b5adfc103345fa2525236c53313dcda1cfb7c0)
+++ lams_tool_whiteboard/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
@@ -216,7 +216,7 @@
 		
 
 		<iframe id="whiteboard-frame"
-		        src='${whiteboardServerUrl}?whiteboardid=${wid}&username=${whiteboardAuthorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(whiteboardCopyAccessToken)}'>
+		        src='${whiteboardServerUrl}/?whiteboardid=${wid}&username=${whiteboardAuthorName}${empty whiteboardAccessToken ? "" : "&accesstoken=".concat(whiteboardAccessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(whiteboardCopyAccessToken)}'>
 		</iframe>
 
 		<!-- Reflection -->
Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rd1b5adfc103345fa2525236c53313dcda1cfb7c0 -r645056c136b15a368e557dd13ea7154b0eea48a2
--- lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision d1b5adfc103345fa2525236c53313dcda1cfb7c0)
+++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 645056c136b15a368e557dd13ea7154b0eea48a2)
@@ -834,7 +834,7 @@
 		<%-- If there is no grouping, data is loaded immediately.
 		     If there is grouping, data is loaded on panel expand. --%>
 		<iframe class="whiteboard-frame"
-				${sessionMap.isGroupedActivity ? "data-" : ""}src='${whiteboardServerUrl}?whiteboardid=${groupSummary.wid}&username=${whiteboardAuthorName}${empty groupSummary.accessToken ? "" : "&accesstoken=".concat(groupSummary.accessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(groupSummary.copyAccessToken)}'>
+				${sessionMap.isGroupedActivity ? "data-" : ""}src='${whiteboardServerUrl}/?whiteboardid=${groupSummary.wid}&username=${whiteboardAuthorName}${empty groupSummary.accessToken ? "" : "&accesstoken=".concat(groupSummary.accessToken)}&copyfromwid=${whiteboard.contentId}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(groupSummary.copyAccessToken)}'>
 		</iframe>		
 	
 		<!-- Editable marks section -->