Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/static/coffee/src/discussion/content.coffee
	requirements.txt