resolving local merge with master

...angoapps/contentstore/management/commands/check_course.py

cms/envs/aws.py

cms/envs/common.py

cms/envs/dev.py

cms/envs/test.py

cms/static/client_templates/checklist.html

cms/static/coffee/src/views/module_edit.coffee

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

cms/static/coffee/src/views/unit.coffee

cms/static/js/base.js

cms/static/js/views/checklists_view.js

cms/static/js/views/course_info_edit.js

cms/static/js/views/settings/advanced_view.js

cms/static/sass/_base.scss

cms/static/sass/_cms_mixins.scss

cms/static/sass/_reset.scss

cms/static/sass/_variables.scss

cms/static/sass/base-style.scss

cms/static/sass/elements/_controls.scss

cms/static/sass/elements/_footer.scss