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

Revert 'disable some admin/report pages that cause slow queries'
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into test