Added test to verify that there is a certain order in the controls -- tabbing on the speed control will malfunction if it is not the case.

Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button.

Fix capa optioninput template to honor inline flag

Don't show course about page link when we have the marketing site.

vagrant: Add flag to ensure install is completed at least once

STUD-733

due to the MixedModuleStore pending release, we need to make enrollment ...

due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio

The provisioning script used to check for the existence of the
`/opt/edx/node_modules` folder to decide if the installation has already
been completed. However, since additional instructions were executed
by the installer afterwards, any installation error (eg. download
timeouts on low quality connections) happening between the creation of
that folder and the end of the installation wouldn't be recovered from
on the next vagrant instance boot.

Fix bug when editing video causes other components to lose their header

Add link in lms legacy instructor dashboard to cms course_index

* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink

fix simple things because, damn

add requests and nltk to sandbox reqs

Pass in harvest args to fasttest_acceptance, not the args array

Cleanup bulk email app

fix pep8 and pylint errors

Adam/merge conflicts

Hotfix/release multiple video bug

Skip migrations if running acceptance in fasttest mode

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py

Fix/adam/add edge reqs

Fix for acceptance test static file issue