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

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

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

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