Changed Wrapper Template Logic to not create un-wanted divs
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-option-deletion-wrapper

Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment-lms.min.js
Merge pull request #495 from edx/grady/fix-option-deletion-wrapper

Changed Wrapper Template Logic to not create un-wanted divs