Revert pull request #3466
Merge pull request #3723 from edx/db/revert-pr-3466

Revert pull request #3466
Fix bug affecting video transcripts in XMLModulesStore courses
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.
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 pull request #3737 from edx/ahodges/documentation/fixup

Correcting "make html" errors
Disable failing cms acceptance tests
Release Notes file setup

DOC-400
Merge pull request #3705 from edx/markhoeber/documentation/doc-400

Release Notes 05/14/14
Merge pull request #3742 from edx/zoldak/disable-failing-cms-test

Disable failing cms acceptance tests
Merge branch 'release' (after release-2014-05-14).
Allow creation of components on container page

This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.
Revise drag and drop acceptance tests.