Merge remote-tracking branch 'master' into authoring

Merged in AI Grading changes

Conflicts:
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/static/js/src/oa_edit.js
	openassessment/xblock/xml.py