Work on acceptance tests.
Merge branch 'anton/video_subtitles' of https://github.com/edx/edx-platform into anton/video_subtitles