Adding in templates for rendering of Student Training Examples.
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/static/sass/oa/utilities/_developer.scss
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/static/css/openassessment.css
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/static/sass/oa/utilities/_developer.scss
Added in templates for Student Training Authoring
Included:
- HTML Templating using current problem defininition
- Styles
Not included:
- JavaScript changes
- Python test cleanup
Merge pull request #504 from edx/will/fix-js-minification

Fix JS minification in Makefile to use the new directory structure
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/studio_mixin.py
Merge pull request #502 from edx/grady/student-training-authoring-templates

Grady/student training authoring templates
Wiring the Authoring GUI for allow image submissions
Merge pull request #497 from edx/sanchez/allow_image_upload_editing

Wiring the Authoring GUI for allow image submissions
Update the edit rubric templates to include both a name and label for criteria and options

Update container JS to retrieve both name and label for criteria and options

Update schema to make 'name' optional and 'label' required; the XBlock editor handler assigns UUIDs to criteria and options that don't have names

Assign labels to criteria/options if they do not have any

Update the grade template to display criteria/option labels if they're provided, otherwise use the 'name' field

Update student facing rubric templates to display the label if it's available

Add label field to XML problem definition.

Add label field to assessment

Add label field to the data dump script.

Update the turbo mode template to use option labels

Exclude the "name" key for new criteria and options in the JSON dict sent to the server.
Default new option points to 1 instead of NaN

Add data migration to fill in labels with default values