Conflicts:
	AUTHORS
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/tests/test_checklists.py
	cms/urls.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_about.html
	lms/templates/main_django.html

Joe Blaylock <jrbl@jrbl.org> intentionally left all conflicts in place,
so that we can work through resolving them systematically.