Conflicts:
	AUTHORS
	CHANGELOG.rst
	common/djangoapps/student/views.py
	lms/djangoapps/bulk_email/admin.py
	lms/djangoapps/bulk_email/migrations/0001_initial.py
	lms/djangoapps/bulk_email/models.py
	lms/djangoapps/bulk_email/tasks.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/tests/test_courses.py
	lms/djangoapps/instructor/views/legacy.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_variables.scss
	lms/templates/courseware/instructor_dashboard.html
	lms/templates/dashboard.html
	lms/templates/main.html