Added merge to SEBTS_24
Updating to MOODLE_25
Merge branch 'master' into release