MDL-44398 tags: Fix incorrect usage of caps
MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc
MDL-45365 Courselib unit tests: cmid -> instanceid confusion

Yet again an instanceid is being passed instead of a cmid.
Merge branch 'MDL-44398-master' of git://github.com/ankitagarwal/moodle
Merge branch 'MDL-43570' of https://github.com/KristerV/moodle

Conflicts:
	version.php
Merge branch 'MDL-45365-master' of git://github.com/damyon/moodle
MDL-36836 filepicker: alfresco select box fix

Adjusted position of alfresco select box; amended border/background application in base.
Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element"

This reverts commit 05a7f9e749ac31a0a0c9e59a1e0ddab065ddc2f7.
Merge branch 'MDL-36836-master' of git://github.com/jethac/moodle
MDL-45253 editor_atto: selectionFilterMatches includes parents
MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty
MDL-45253 editor_atto: Check for button highlights on change event

This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.