Merge branch 'master' into feature/abarrett/lms-notes-app

.gitignore

LICENSE

README.md

__init__.py

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

cms/djangoapps/contentstore/features/checklists.feature

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

cms/djangoapps/contentstore/features/section.feature

cms/djangoapps/contentstore/features/signup.py

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

cms/djangoapps/contentstore/features/subsection.feature

cms/djangoapps/contentstore/features/subsection.py

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_i18n.py

cms/envs/acceptance.py

cms/envs/test.py

cms/static/sass/_variables.scss

common/djangoapps/terrain/browser.py

common/djangoapps/terrain/course_helpers.py

common/djangoapps/terrain/ui_helpers.py