Merge branch 'master' into bug/christina/preview_url

cms/djangoapps/contentstore/features/advanced-settings.py

cms/djangoapps/contentstore/features/checklists.py

cms/djangoapps/contentstore/features/course-settings.py

cms/djangoapps/contentstore/features/courses.py

cms/djangoapps/contentstore/features/section.py

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/views/course.py

cms/envs/common.py

cms/envs/dev.py

cms/envs/jasmine.py

cms/templates/base.html

cms/templates/checklists.html

cms/templates/course_info.html

cms/templates/settings.html

cms/templates/settings_advanced.html

cms/templates/settings_discussions_faculty.html

cms/templates/settings_graders.html

cms/templates/widgets/open-ended-edit.html

common/djangoapps/django_comment_common/__init__.py

...angoapps/django_comment_common/migrations/0001_initial.py