Minify CSS
Merge pull request #493 from edx/will/minify-css

Minify CSS
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
Remember which editor tab was last open.
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
Schema validation for student training examples
Merge remote-tracking branch 'origin/master' into authoring

Conflicts:
	openassessment/xblock/static/css/openassessment.css
Fixup: use resolved submission start/due dates; use UTC for submission start/due in template
Remove unnecessary unicode type conversion
Merge pull request #496 from edx/grady/tab-memory

Remembers which editor tab was last open
Merge pull request #501 from edx/will/small-unicode-fixup

Remove unnecessary unicode type conversion
Merge pull request #500 from edx/will/authoring-submission-date-fixup

Authoring date fixups
Merge pull request #499 from edx/will/authoring-student-training-schema-validation

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

Conflicts:
	openassessment/xblock/studio_mixin.py