Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/assessment-reorder

Conflicts:
	openassessment/xblock/static/js/openassessment-lms.min.js
	openassessment/xblock/static/js/openassessment-studio.min.js