Merge pull request #2910 from edx/frances/feature/studio-nav-manipulation2

CHANGELOG.rst

cms/djangoapps/contentstore/features/pages.feature

cms/djangoapps/contentstore/features/pages.py

cms/djangoapps/contentstore/views/course.py

cms/djangoapps/contentstore/views/tabs.py

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

cms/envs/acceptance.py

cms/envs/aws.py

cms/envs/common.py

cms/envs/dev.py

cms/envs/test.py

cms/static/coffee/src/views/tabs.coffee

cms/static/sass/views/_static-pages.scss

cms/static/sass/views/_unit.scss

cms/templates/edit-tabs.html

cms/templates/export.html

cms/templates/widgets/header.html

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/html_module.py

common/lib/xmodule/xmodule/modulestore/mongo/base.py