Conflicts: lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/templates/course_navigation.html
