The main conflicts were in the presentation.  It seems that we're going
from sections to divs, fine.  But a few material conflicts with changes
in our long-lived branch that we're still carrying around.

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/tests/test_date_utils.py
	common/lib/xmodule/xmodule/util/date_utils.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/courseware/tabs.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/envs/test.py
	lms/static/sass/multicourse/_home.scss
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/courseware/accordion.html
	lms/templates/courseware/course_about.html
	lms/templates/courseware/courseware.html
	lms/templates/courseware/progress.html
	lms/templates/main.html
	lms/templates/main_django.html
	lms/templates/problem.html
	lms/templates/register.html
	lms/templates/registration/password_reset_complete.html