Conflicts:
	apps/openassessment/xblock/test/data/invalid_rubrics.json
	apps/openassessment/xblock/test/data/valid_rubrics.json
	apps/openassessment/xblock/test/test_message.py