Merge branch 'master' into pbaratta/calc-add-trig

.gitignore

AUTHORS

CHANGELOG.rst

README.md

...jangoapps/contentstore/features/advanced-settings.feature

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

cms/djangoapps/contentstore/features/common.py

...ontentstore/features/component_settings_editor_helpers.py

cms/djangoapps/contentstore/features/courses.py

...jangoapps/contentstore/features/discussion-editor.feature

cms/djangoapps/contentstore/features/discussion-editor.py

cms/djangoapps/contentstore/features/problem-editor.feature

cms/djangoapps/contentstore/features/section.feature

cms/djangoapps/contentstore/features/section.py

...ntentstore/features/studio-overview-togglesection.feature

...ps/contentstore/features/studio-overview-togglesection.py

cms/djangoapps/contentstore/features/subsection.feature

cms/djangoapps/contentstore/features/video.feature

cms/djangoapps/contentstore/features/video.py

cms/djangoapps/contentstore/tests/test_contentstore.py