MDL-41418 Administration: Page context should be set before setting page title
MDL-41369 Set proper context and navigation path for user messages
MDL-41485 calendar: Replace value of action buttons on managesubscription page with int
MDL-41456 Events: Fixed existing events to respect base event access specifier and return data type
MDL-28579 SCORM: coding guideline fixes
MDL-41395 improved phpdoc's for coursecatlib.php
MDL-41395 Improved phpdocs for coursecatlib.php
MDL-28579 SCORM: use filemanager instead of old file picker
Merge branch 'master_MDL-28579' of git://github.com/danmarsden/moodle
MDL-28579 scorm: Fix broken unit tests
Merge branch 'wip-MDL-41395-master' of git://github.com/marinaglancy/moodle
Merge branch 'wip-mdl-41418' of git://github.com/rajeshtaneja/moodle
Merge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle
Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle
Merge branch 'MDL-41485-master' of git://github.com/ankitagarwal/moodle