Conflicts:
	openassessment/workflow/api.py
	openassessment/workflow/models.py
	openassessment/workflow/test/test_models.py
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/validation.py
	scripts/data/test-course.tar.gz
	settings/base.py
	settings/test.py