Merge pull request #506 from code-dot-org/staging

Deploy to test
Fix conflicts.
Conflicts.
Conflict