Conflicts: cms/djangoapps/contentstore/views/component.py lms/djangoapps/courseware/tabs.py lms/djangoapps/courseware/views.py lms/templates/courseware/course_navigation.html lms/templates/courseware/courseware.html lms/templates/navigation.html lms/templates/problem.html requirements/edx/github.txt
