Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/static/sass/oa/utilities/_developer.scss