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
Fix merge conflicts
Reformatted tables, copy edited, and proofread.
Merge pull request #3722 from edx/ahodges/documentation/DOC156

Ahodges/documentation/doc156
Reset attempts, delete state and rescore buttons not working on staff debug.
LMS-2706
Add sjson and srt to type map.
A hack to get instructor email to work in Firefox while the video
annotator tool is refactored to not bundle its own tinymce globally.
Fixed on instructor dash too.
Merge pull request #3648 from edx/oleg/fix-download-transcript

Add mime-type for srt and sjson when importing course.
BlockUsageLocators are not AssetKeys.
Merge pull request #3725 from carsongee/cg/transcript_xmlmodulestore_fix

Fix bug affecting video transcripts in XMLModulesStore courses
Correcting "make html" errors
Merge pull request #3732 from edx/waheed/lms2706-reset-delete-not-working-staff-debug

Reset, delete and rescore not working on staff debug info
Merge pull request #3735 from edx/usman/lms2557-bulk-email-hack

Fix for bulk email not working in Firefox
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_handlers.py
Fix merge conflicts
Fix instructor csv download
Merge pull request #3737 from edx/ahodges/documentation/fixup

Correcting "make html" errors