Merge branch 'master' into drupal-new

.gitignore

AUTHORS

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_course_settings.py

cms/djangoapps/contentstore/tests/test_item.py

cms/djangoapps/contentstore/views/item.py

cms/envs/test.py

cms/static/sass/_base.scss

cms/static/sass/elements/_header.scss

common/.gitignore

common/djangoapps/util/views.py

common/lib/.gitignore

common/lib/calc/calc.py

common/lib/calc/setup.py

common/lib/capa/capa/capa_problem.py

common/lib/capa/capa/inputtypes.py

common/lib/capa/capa/responsetypes.py

common/lib/capa/capa/safe_exec/README.rst

common/lib/capa/capa/safe_exec/__init__.py

common/lib/capa/capa/safe_exec/lazymod.py