MDL-44575: Prevent cron from sending feedback notifications when assignments are hidden in the gradebook
MDL-44398 tags: Fix incorrect usage of caps
MDL-45256 portfolio: Do not require strict XML when parsing content
MDL-45256 portfolio: Unit tests for rewrite pluginfile urls
MDL-45283 restore: Prevent failure when user course grade exists

When we restore a course, the grade that a user has for the
grade item of the course cannot be created twice. If we try
to create it when it already exists, a database exception is
raised because of index duplication.

The safest way to proceed is certainly to ignore the grade
information from the backup, otherwise we could potentially
overwrite existing information. Though, this only applies
to restore as merge, and it does not affect the update of
the course grade.
MDL-45292 filepicker: improved RTL styles

Fixed some broken RTL styles.
Merge branch 'MDL-45256-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
Merge branch 'mdl44575-moodle25' of https://github.com/tlock/moodle into MOODLE_25_STABLE
MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc
Merge branch 'MDL-45283-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
Merge branch 'MDL-45292-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
MDL-45365 Courselib unit tests: cmid -> instanceid confusion

Yet again an instanceid is being passed instead of a cmid.
Merge branch 'MDL-44398-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
Merge branch 'MDL-43570-M25' of https://github.com/KristerV/moodle into MOODLE_25_STABLE
MDL-43570 upgrade: fix indentation
Merge branch 'MDL-45365-25' of git://github.com/damyon/moodle into MOODLE_25_STABLE
MDL-36836 filepicker: alfresco select box fix

Adjusted position of alfresco select box.