Hotfix Google Logo
Merge branch 'production' of github.com:code-dot-org/code-dot-org into production
Merge branch 'test' into staging