Conflicts:
	lms/djangoapps/courseware/module_render.py

Merge master into opaque-keys

Adding new attribute to the xmodule_runtime to check admin privileges on users

Unique Course Fix

move upload asset code for assets to AssetsView

Sarina/lms 2748

Revert "added and updated pavelib/quality.py..."

This reverts commit 7fd2305f.

Video: Fix transcript displaying on iPad.

i18n: Make static strings in xmodule files extractable

mentoring-opaque-keys: Adds support for opaque keys

Skip brittle HTML editor lettuce test

Updates commit hash to add support for opaque keys in mentoring. See
https://github.com/gsehub/xblock-mentoring/pull/2 for the relevant
commits.

Flaky for Bok-Choy Video Tests

Update index file; change link in PA for Students

They can now be extracted.

New Open edX Install/Operations doc

Modified description of transcript bug fix

As well as updated the index page for usability

Fix cohorting views

Use old deprecated form for instructor api calls, and in staff debug info

doc-389

This fixes a few accessibility problems with drag and drop

Sarina/course modes display

i18n: Make checklists translatable

Ahodges/documentation/doc156

Benpatterson/disable course export acc test