Merge pull request #2552 from edx/giulio/edit-in-cms-links

common/djangoapps/xmodule_modifiers.py

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/modulestore/inheritance.py

lms/djangoapps/courseware/courses.py

lms/djangoapps/courseware/module_render.py

lms/djangoapps/courseware/tests/test_courses.py

lms/djangoapps/courseware/tests/test_masquerade.py

lms/djangoapps/courseware/tests/test_module_render.py

lms/djangoapps/courseware/views.py

lms/djangoapps/instructor/features/bulk_email.py

lms/djangoapps/instructor/features/common.py

lms/djangoapps/instructor/views/instructor_dashboard.py

lms/djangoapps/instructor/views/legacy.py

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

lms/static/sass/multicourse/_course_about.scss

lms/templates/courseware/course_about.html

lms/templates/courseware/course_navigation.html

lms/templates/courseware/info.html

lms/templates/courseware/instructor_dashboard.html

lms/templates/courseware/progress.html