Merge branch 'master' into kimth/generic-coderesponse

common/djangoapps/static_replace.py

common/djangoapps/student/models.py

common/djangoapps/student/tests.py

common/djangoapps/student/views.py

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/css/capa/display.scss

common/lib/xmodule/xmodule/css/video/display.scss

common/lib/xmodule/xmodule/x_module.py

lms/djangoapps/courseware/grades.py

lms/djangoapps/courseware/tests/tests.py

lms/static/sass/course.scss

lms/static/sass/course/_info.scss

lms/static/sass/course/base/_base.scss

lms/static/sass/course/base/_extends.scss

lms/static/sass/course/courseware/_courseware.scss

lms/static/sass/course/courseware/_sidebar.scss

lms/static/sass/course/discussion/_answers.scss

lms/static/sass/course/discussion/_forms.scss

lms/static/sass/course/wiki/_sidebar.scss

lms/static/sass/multicourse/_dashboard.scss