Conflicts: common/djangoapps/student/models.py lms/djangoapps/courseware/views.py lms/templates/course_navigation.html
