A refactoring of the Drag and Drop changes which now encorporates the OAEdit refactor.
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
Merge pull request #490 from edx/grady/assessment-reorder

Grady/assessment reorder