Review error messages and UI text
Edit error messages in .py files
Corrected tiny typo in models.py
Revise UI and error message text in .js files
Updated "Could not contact server" error messages
UI and error message text updates
Merge pull request #255 from edx/sylvia/docs/API-UI-text

Sylvia/docs/api ui text
Fix tests that broke during text updates
Fix tests that broke during text updates
Use criterion and option order num instead of name in HTML attributes
Fix for TIM-449. Do not use Peer UUID
Merge pull request #264 from edx/sanchez/TIM-449-No-Sub-Matching-UUID

Fix for TIM-449. Do not use Peer UUID
Merge pull request #265 from edx/will/fix-master

Fix tests that broke during text updates
Fix for TIM-449. Do not use Peer UUID

Conflicts:
	apps/openassessment/assessment/peer_api.py
Tag i18n strings in templates
Merge pull request #247 from edx/will/i18n

Tag i18n strings in templates
Merge pull request #266 from edx/will/criterion-name-in-dom

Will/criterion name in dom
Do not use the submission_uuid from a response for peer
The Workflow API was still using the submission_uuid within a peer response.  Removed this, and updated tests accordingly.
Merge pull request #268 from edx/sanchez/fix_submission_uuid_use

Do not use the submission_uuid from a response for peer
Do not use the submission_uuid from a response for peer
The Workflow API was still using the submission_uuid within a peer response.  Removed this, and updated tests accordingly.
Removing the peer uuid from the assessment api
Changing the Peer API signatures to use submission UUID instead of student items. This will greatly simplify our APIs uses and queries.
Merge pull request #270 from edx/sanchez/TIM-267-Student-State

WIP: Removing the peer uuid from the assessment api
Allow the user to confirm/cancel before submitting a response
Merge branch 'release'

Conflicts:
	apps/openassessment/assessment/peer_api.py
	apps/openassessment/assessment/test/test_peer.py
	apps/openassessment/xblock/test/test_peer.py