MDL-1626 mod_forum: Add icons for subscription status
MDL-1626 mod_forum: Update user interface to reflect per-discussion subscriptions

AMOS BEGIN
  MOV [forcessubscribe,mod_forum],[forcesubscribed,mod_forum]
AMOS END
MDL-1626 mod_forum: Update discussion subscriptions when moving discussions
MDL-42716 Assign: Implemented capability based viewing of blind details (squashed)
MDL-42716 assign: whitespace fix
Merge branch 'MDL-46035_survey' of https://github.com/andyjdavis/moodle
Merge branch 'wip-MDL-46038-master' of git://github.com/marinaglancy/moodle
Merge branch 'MDL-45044-master' of git://github.com/dthies/moodle
Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle
MDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign pages.
MDL-41448 Assign: Add note to theme/upgrade.txt about CSS changes in mod_assign
Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle
Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle
Merge branch 'MDL-45933-master' of git://github.com/damyon/moodle
Merge branch 'MDL-46031' of git://github.com/timhunt/moodle
Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
Merge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle
MDL-1626 mod_forum: Correct SQL syntax when fetching subscriptions
MDL-10115 User profile: Use title to aid in the ellipsis link being understood by screen readers
Merge branch 'MDL-10115-master' of git://github.com/xow/moodle