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
Merge pull request #3736 from edx/dhm/opaque-no-asset

Dhm/opaque no asset
Disable failing cms acceptance tests
Merge pull request #3673 from cpennington/opaque-keys-merge-master

Merge master into opaque-keys
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).
Fixes issue with metrics tab click handlers
  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.
Revert "Revert pull request #3466"

This reverts commit 59e3cae4c9c6f2c95a816a8280b470ec6add9486.
Fix for 500 error (undefined) in annotation tool
Update opaque_keys docs
Added rst version of cognitive load page
Update get_discussion_link command to use CourseKeys
add So You Want to Deploy a New Service
Merge pull request #3584 from edx/dcadams/metrics_tab_download_csv

Metrics tab - fix click handlers and add download buttons
Ensure all cms commands accept either deprecated or new syntax for keys
LMS-2712