MDL-38079 mod_feedback - Hide "add question to activity" button
MDL-40210 do not use CAP_PREVENT for role defaults!
Merge branch 'MDL-30132_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
Merge branch 'MDL-33562-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE

Conflicts:
	lib/db/upgrade.php
	version.php
Merge branch 'w25_MDL-40210_m25_badgescaps' of git://github.com/skodak/moodle into MOODLE_25_STABLE
Merge branch 'MDL-40109_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
Merge branch 'wip-mdl-39863-m25' of git://github.com/rajeshtaneja/moodle into MOODLE_25_STABLE
Merge branch 'wip-MDL-40137-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE
MDL-40137 Whitespace fix
Merge branch 'MDL-38079_25' of git://github.com/mr-russ/moodle into MOODLE_25_STABLE
Merge branch 'MDL-39865-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
Merge branch 'MDL-40036-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE
MDL-40180 - RTL/Clean theme: Misalignment of student name and profile image in grader (fixed by Mary Evans)

Conflicts:
	theme/bootstrapbase/style/moodle.css
Merge branch 'MDL-39634_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
Merge branch 'MDL-40165-m25' of git://github.com/andrewnicols/moodle into MOODLE_25_STABLE
MDL-33546: course: Fix current week hightlighting after dragging the section
Merge branch 'MDL-40207-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
MDL-40109 behat: Fixing backup feature
MDL-40022 badges: Fix missing calls to setType in course criteria settings
MDL-39760: mod_assign: Add few more callback methods.

Adds lock, unlock and release_to_draft. All of them accept single parameter -
an assign_submission record.