Conflicts:
	AUTHORS
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/submission_mixin.py
	openassessment/xblock/test/data/update_from_xml.json
	openassessment/xblock/test/test_submission.py
	openassessment/xblock/test/test_xml.py
	openassessment/xblock/xml.py