Conflicts:
	apps/openassessment/xblock/static/js/fixtures/templates.json
	apps/openassessment/xblock/static/js/openassessment.min.js
	apps/openassessment/xblock/static/js/spec/oa_staff_info.js