Update placeholder text for student training responses to match current UI
Merge pull request #468 from edx/sylvia/docs/TIM-538

Update placeholder text for student training responses to match current UI
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