advance.jsp

Merge branch 'LDEV-5397' into v4.8
# Conflicts:
# lams_learning/web/includes/javascript/learnerPage.js
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java
# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java
# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java