Conflicts: common/djangoapps/student/views.py common/lib/xmodule/xmodule/graders.py lms/templates/dashboard.html lms/templates/footer.html requirements/edx/base.txt
