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

DTT
Merge pull request #848 from code-dot-org/staging

DTT
Merge pull request #849 from code-dot-org/staging

DTT
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into test