authoring.jsp

Merge remote-tracking branch 'origin/LDEV-5357' into v4.7
Conflicts:
lams_admin/web/userChangePass.jsp
lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
lams_central/web/WEB-INF/web.xml
lams_central/web/authoring/authoring.jsp
lams_central/web/authoring/svgGenerator.jsp
lams_central/web/extGroups.jsp
lams_central/web/orgGroup.jsp
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
lams_monitoring/web/grouping/chosenGrouping.jsp