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

Included as a seperate commit so that merge can be examined if broken.

Conflicts:
	AUTHORS
	apps/openassessment/xblock/static/js/openassessment.min.js
	apps/openassessment/xblock/studio_mixin.py
	openassessment/xblock/openassessmentblock.py
	openassessment/xblock/xml.py