Merge pull request #6352 from edx/gprice/video-upload-csv

cms/djangoapps/contentstore/admin.py

cms/djangoapps/contentstore/migrations/0001_initial.py

cms/djangoapps/contentstore/migrations/__init__.py

cms/djangoapps/contentstore/models.py

cms/djangoapps/contentstore/views/tests/test_videos.py

cms/djangoapps/contentstore/views/videos.py

cms/static/js/factories/videos_index.js

cms/static/js/spec/views/previous_video_upload_spec.js

cms/static/js/views/previous_video_upload.js

cms/static/js/views/previous_video_upload_list.js

cms/static/sass/views/_video-upload.scss

cms/templates/js/previous-video-upload-list.underscore

cms/templates/videos_index.html

cms/urls.py

requirements/edx/base.txt