Merge branch 'master' into
LDEV-4407 Conflicts:
lams_build/lib/lams/lams-gradebook.jar
lams_build/lib/lams/lams-learning.jar
lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
lams_central/web/css/pedagogicalPlanner.css
lams_central/web/includes/javascript/openUrls.js
lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java
lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
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/imageGalleryApplicationContext.xml
lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
