Dropbox changes
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

Conflicts:
	pegasus/sites.v3/hourofcode.com/public/resources.md
Updated Team page.