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
Add time fields to the OA editing views
Use resolve dates for default date values
Merge pull request #498 from edx/will/authoring-datetime-fields

Date and time pickers
Merge pull request #495 from edx/grady/fix-option-deletion-wrapper

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

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