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

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

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

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