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

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