Conflicts:
	common/djangoapps/student/views.py
	common/lib/xmodule/xmodule/js/src/peergrading/track_changes.coffee
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
	lms/templates/courseware/course_about.html
	lms/templates/courseware/course_navigation.html
	lms/templates/navigation.html
	lms/templates/open_ended_problems/open_ended_problems.html