MDL-39910 mod_scorm: fix enable/disable navigation buttons
MDL-39910 SCORM: set correct site level defaults.
MDL-39910 SCORM: set correct site level defaults.
Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle

Conflicts:
	mod/scorm/db/upgrade.php
MDL-35217 afterburner: applying orientations
ie9 svg compatibility fixes
fix permissions
weekly release 2.6dev
MDL-40769 usability: new icons for TinyMCE in svg and png formats
MDL-40770 TinyMCE - Implement new icons
MDL-40769 usability: additional icons for TinyMCE in svg and png formats
MDL-40770 TinyMCE - Further changes to implement new icons
MDL-40769 usability: last bit of icons for TinyMCE in svg and png formats
MDL-40770 TinyMCE - Implementing new icons
MDL-41385 usability: new non-default icons for TinyMCE in svg and png formats

Conflicts:

	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/delete.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/delete.svg
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/spellcheck.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/table.png
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/table.svg
MDL-40770 TinyMCE - Final Icon implementation