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

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

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

DTP
Hotfix: Fix haml error
Hotfix: Added back old Gotham CSS files.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into test
Merge branch 'production' of github.com:code-dot-org/code-dot-org into test