Merge branch 'master' of github.com:edx/edx-platform

.jshintrc

AUTHORS

CONTRIBUTING.rst

README.rst

cms/djangoapps/contentstore/features/course-updates.feature

cms/djangoapps/contentstore/features/video.py

...ngoapps/contentstore/management/commands/delete_course.py

...tentstore/management/commands/tests/test_delete_course.py

cms/djangoapps/contentstore/tests/test_courseware_index.py

cms/djangoapps/contentstore/tests/test_crud.py

cms/djangoapps/contentstore/tests/test_i18n.py

cms/djangoapps/contentstore/tests/test_libraries.py

cms/djangoapps/contentstore/tests/test_utils.py

cms/djangoapps/contentstore/views/component.py

cms/djangoapps/contentstore/views/entrance_exam.py

cms/djangoapps/contentstore/views/library.py

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

cms/envs/aws.py

cms/envs/bok_choy.env.json

cms/envs/common.py