MDL-45201 recent_activity: Fix set type notice in recent activity form
MDL-45414 wiki: fix broken image
MDL-45290 rubrics: overflow, delete button alignment

Adjusted delete button alignment, restored overflow rule, amended button alignment, minor RTL fixes.
MDL-45429 block_glossary_random: check capability before suggesting to edit
MDL-45387 core_form: erroneous escaping on reference list

Fixed erroneous escaping in JS.
Merge branch 'wip-MDL-45429-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
Merge branch 'wip-MDL-45414-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE
MDL-44606 Assign: Some grading functions are missing sesskey protection
MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks.

I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
Merge branch 'MDL-45201-25' of git://github.com/ankitagarwal/moodle into MOODLE_25_STABLE
Merge branch 'MDL-45387-25' of git://github.com/jethac/moodle into MOODLE_25_STABLE
Merge branch 'MDL-45290-25-fix3' of https://github.com/jethac/moodle into MOODLE_25_STABLE
MDL-43877 blocks: Files from blocks in my/ were accessible to the world
MDL-45410 Merge English strings from the en_fix language pack
MDL-45282 core_user: fixed up some oddities in the bulk user messaging screen
MDL-43119 Add valid until dates for tokens created by login/token.php

3 months were decided

Conflicts:
	login/token.php
MDL-45126 do not allow guests see name and summary of hidden course
Merge branch 'MDL-45410-en_fix-25' of git://github.com/mudrd8mz/moodle into MOODLE_25_STABLE
MDL-44750 Assign: Do not reveal student identities to screen readers
Merge branch 'MDL-45282_message_25' of git://github.com/andyjdavis/moodle into MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css