Conflicts:
	AUTHORS
	CHANGELOG.rst
	cms/djangoapps/contentstore/views/assets.py
	common/djangoapps/student/management/commands/anonymized_id_mapping.py
	common/djangoapps/student/views.py
	lms/envs/common.py
	lms/static/sass/course.scss.mako
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/courseware/courseware-error.html
	lms/templates/courseware/instructor_dashboard.html
	lms/templates/dashboard.html
	lms/templates/index.html
	lms/templates/main_django.html
	lms/templates/module-error.html
	lms/templates/peer_grading/peer_grading_problem.html
	lms/templates/registration/password_reset_complete.html