Merge remote-tracking branch 'origin/v4.0' into v5.0
Conflicts:
lams_build/3rdParty.userlibraries
lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql
lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql
lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql
lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java
lams_monitoring/web/tblmonitor/teams.jsp
lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag
lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
lams_tool_lamc/web/authoring/BasicContent.jsp
lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
lams_tool_lamc/web/learning/ViewAnswers.jsp
lams_tool_lamc/web/monitoring/SummaryContent.jsp
lams_tool_lamc/web/monitoring/parts/statsPart.jsp
lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
