MDL-38315 Completion: Bugs with 'locked' status in activity form
MDL-38055 course: fixed double encoding of title properties

Conflicts:
	lib/navigationlib.php
MDL-37966 Assignment: put upgraded modules where the originals were
MDL-38361: Fixed typos in mod/assign/locallib.php
MDL-38545 Reports: PHP Strict Standards error in graph.php
MDL-38480_m24 Fix for messy usage of language strings in block course overview
MDL-37844 SCORM: fix js error and highlight selected node in TOC.
MDL-35840 SCORM TOC: fixed a typo, improvements on getting the focus
MDL-38824 Activity completion: Automatic completion quotes not escaped
MDL-39000 Conditional activities: Section condition restore errors
MDL-29877 core_grade:add some upgrade code to fix broken grade items introduced by bad restores
MDL-39080 theme_formal_white: modified "Main menu" block look to resemble the "Navigation" one
MDL-38011 completion: Use new localised role names
MDL-37537 completion: Fix incorrect lang string reference in block
MDL-38880 Imported Cloze questions lose embedded images or other media
MDL-38637 CAS Authentication: Undefined index: QUERY_STRING when executing cron
Merge branch 'MDL-37537-24' of git://github.com/srynot4sale/moodle into MOODLE_24_STABLE
MDL-39054 quiz statistics: move hard-coded text to lang file
Merge branch 'MDL-29877_bad_grade_item_24' of git://github.com/andyjdavis/moodle into MOODLE_24_STABLE

Conflicts:
	version.php
MDL-29877 Grades - version bump for upgrade step.

And whitespace...