Merge remote branch 'origin/release' into develop
bump version
implementing test return to typists

- add functionality to allow supervisors and admins to
  return a test back to the typist from the adjudication page
minor updates involving use of language
Merge remote branch 'origin/develop' into qa
bug-fix: lowercase user id on note button text