Giulio Gratta <giulio@giuliogratta.com> merged LMS HTML template files by
hand.

Joe Blaylock <jrbl@stanford.edu> merged the rest of the conflicts, which
included:
	common/djangoapps/student/views.py
	common/djangoapps/track/views.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/tests/test_courses.py
	lms/djangoapps/instructor/views/legacy.py
	lms/envs/common.py
	lms/envs/test.py