There were previous merge conflicts in the file.

When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.

This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.

Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.

Delete on publish to prevent orphans

Use wrapped tar extraction

Signed-off-by: Julian Arni <julian@edx.org>

Bug fix video player controls a11y

when draft is deleted and then parent published.
ensure moving doesn't cause deletion

First pass at ARIA. Video player buttons announce themselves as button when used with a screen reader

Refactor upload tests and add locked asset tests for registered user

Create management command to edit course's tabs

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

Fix run single test example

New XML infrastructure for XBlocks

We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability.

Just works on the tabs list in mongo, nothing
deeper than that.
Added implementation functions in tabs.py,
providing a first step for some future
GUI editor.