Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html

disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block

Update Video component to reflect new UI

Update opaque_keys docs

remove redundent code on course import

Update get_discussion_link command to use CourseKeys

Skip language changing tests

Ensure all cms commands accept either deprecated or new syntax for keys

STUD-1595

LMS-2712

Metrics tab - fix click handlers and add download buttons

  Click handlers were not getting attached to DOM elements in some cases on slow running machines.
  Added logic to attach handlers when elements are ready.

Added 2 buttons on metrics tab:
  Download Subsection Data for downloading to csv.
  Download Problem Data for downloading to csv.

Disable failing cms acceptance tests

Release Notes 05/14/14

DOC-400

Merge master into opaque-keys

Dhm/opaque no asset

Correcting "make html" errors

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_handlers.py

Fix for bulk email not working in Firefox

Reset, delete and rescore not working on staff debug info

Fix bug affecting video transcripts in XMLModulesStore courses

Add mime-type for srt and sjson when importing course. 

annotator tool is refactored to not bundle its own tinymce globally.

LMS-2706