Conflicts:
	lms/static/coffee/src/instructor_dashboard/membership.coffee
	lms/templates/instructor/instructor_dashboard_2/membership.html
	requirements/edx/github.txt