adjusting wording on choice expand block
Show order errors in page instead of in an alert.
Merge pull request #964 from edx/fix/frances/copy-edits-mode-choice

adjusting wording on choice expand block
Verification: revises copy on receipt page to reflect a completed registration process
Merge pull request #967 from edx/talbs/fix-verification-copy

Verification Process: Copy Changes
Fix nopathtoitem error in peer grading
Address review comments
Fix problem with peer grading list not rendering, test
Address review comments
Fix linking problem for peer grading, add in a test

Conflicts:
	common/lib/xmodule/xmodule/tests/test_peer_grading.py
Make sure we use the name that was frozen at time of verification when sending to Software Secure.
Minor fixes to handle non-ASCII names/config in student verification.
adjusted error wording on failed photo verification order
Merge pull request #972 from edx/ormsbee/ss_small_fixes

Small fixes for unicode
adjusted error wording on failed photo verification order
Merge pull request #971 from edx/fix/vik/pg-hotfix

Fix/vik/pg hotfix
Merge pull request #963 from edx/diana/better-order-error-handling

Show order errors in page instead of in an alert.
LMS: resolves alt attribute copy issue for app/brand logo element - i8tn and settings data
Use a setter to make editing location possible
Verification: revises instructional photo review copy to match page layout change