Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
Add ADDL_INSTALLED_APPS to studio for parity with lms
May change log fix
Merge pull request #3719 from edx/markhoeber/documentation/change-log-fix

May change log fix
Merge pull request #3706 from edx/adam/fix-non-ascii-grade-range

Adam/fix non ascii grade range
Staff Debug includes links to reset/rescore/delete state for a student
Merge pull request #3698 from edx/ahodges/documenttion/DOC387

Ahodges/documenttion/doc387
Merge pull request #3711 from edx/flowerhack/fix-subhist

Fix improper parsing of location string
Merge pull request #3598 from edx/zoldak/rebalance-cms-shards

Rebalance CMS acceptance test shards
DOC-405: privileges in Studio=privileges in LMS
Merge pull request #3689 from edx/ahodges/documentation/DOC405

DOC-405: privileges in Studio=privileges in LMS
Changes for LMS-2591, Instructor Dash switchover
Merge pull request #3720 from edx/ahodges/documentation/LMS2591

Changes for LMS-2591, Instructor Dash switchover
Revert pull request #3466
Merge pull request #3723 from edx/db/revert-pr-3466

Revert pull request #3466
Merge pull request #3703 from edx/sanchez/course-anonymous-ids-in-csv

Changing Student Anon ID Dump to return Course Specific IDs.
Fix bug affecting video transcripts in XMLModulesStore courses
Fix spoc_gradebook
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py