Merge pull request #429 from code-dot-org/test

Daily DTP
hotfix hoc.com /teachforall and /teachforamerica
Merge branch 'production' into test