educate2/curriculum merge conflict
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging