Conflicts:
	cms/djangoapps/contentstore/views/checklist.py
	cms/templates/index.html
	cms/templates/widgets/header.html
	cms/templates/widgets/sock.html
	cms/urls.py
	common/djangoapps/student/views.py
	common/lib/capa/capa/tests/test_targeted_feedback.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/lti_module.py
	common/lib/xmodule/xmodule/tests/test_lti20_unit.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_access.py
	lms/djangoapps/courseware/tests/test_courses.py
	lms/djangoapps/courseware/tests/test_lti_integration.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/templates/courseware/course_navigation.html
	lms/templates/dashboard/_dashboard_course_listing.html
	lms/templates/navigation.html
	requirements/edx/github.txt