main.jsp

Merge branch 'develop' into LDEV-4759
# Conflicts:
# lams_central/web/authoring/template/tool/mcquestion.jsp
# lams_central/web/authoringConfirm.jsp
# lams_central/web/css/_learner_base.scss
# lams_central/web/profile/editprofile.jsp
# lams_learning/web/optionsActivity.jsp
# lams_monitoring/web/monitor.jsp
# lams_monitoring/web/tblmonitor/sequence.jsp
# lams_monitoring/web/tblmonitor/teams.jsp
# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
# lams_tool_lamc/web/authoring/candidateAnswersList.jsp
# lams_tool_lamc/web/common/monitoringheader.jsp
# lams_tool_preview/web/pages/monitoring/criteria.jsp
# lams_tool_preview/web/pages/monitoring/reflections.jsp
# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
# lams_tool_task/web/common/monitorheader.jsp