BUGFIX: Too many assessments used in score.
Merge pull request #471 from edx/will/assessment-score-bug

BUGFIX: Too many assessments used in score.
Explicit action to begin turbo mode.
Merge pull request #472 from edx/sanchez/ORA-37-Explicit-Turbo-Mode

ORA-37 Explicit action to begin turbo mode.
Add locks and a default value for the migration that adds criterion_id to assessmentpart
Merge pull request #475 from edx/will/update-migration

Update migration to add criterion_id to AssessmentPart
Allow criteria with no options, just written feedback.
Merge pull request #463 from edx/will/0-option-criterion

Feedback-only criteria
Allowing file based submissions for ORA2
Merge pull request #464 from edx/sanchez/TIM-645-Image-Submissions

Allowing file based submissions for ORA2
Fixing error toggling for server-side errors.
Merge pull request #481 from edx/sanchez/better-image-submission-errors

Fixing error toggling for server-side errors.
Better handling of duplicate training essays
Merge pull request #484 from edx/sanchez/ORA-640-Disallow-Duplicate-Essays

Better handling of duplicate training essays
Update i18n translations
Use the read replica in the download data management command.
Merge pull request #488 from edx/will/data-download-uses-read-replica

Use the read replica in the download data management command.
Merge pull request #490 from edx/grady/assessment-reorder

Grady/assessment reorder
Merge remote-tracking branch 'origin/master' into authoring

Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment.min.js
	openassessment/xblock/static/js/src/oa_server.js
	openassessment/xblock/static/sass/oa/utilities/_developer.scss
	openassessment/xblock/student_training_mixin.py
	openassessment/xblock/test/data/invalid_rubric.xml
	openassessment/xblock/test/test_student_training.py
	openassessment/xblock/test/test_studio.py
	openassessment/xblock/test/test_xml.py
	openassessment/xblock/xml.py
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/assessment-reorder