Standardize build tools using make
Quiet the doc and i18n scripts
Add locale to i18n script
Use PhantomJS as the headless test runner.
Refactor file upload tests
Remember which editor tab was last open.
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
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 pull request #492 from edx/will/standardize-build-tools

WIP: Standardize build tools using make
Merge remote-tracking branch 'origin/master' into authoring

Conflicts:
	openassessment/xblock/static/js/openassessment.min.js
	scripts/install-js.sh
Fix JS minification in Makefile to use the new directory structure
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.