Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py