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

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

DTT
Merge pull request #678 from code-dot-org/test

DTP
hotfix hourofcode.com i18n syntax errors
Merge branch 'test' into staging