Merge branch 'staging' into hoc-ee-congrats

Conflicts:
	pegasus/sites.v3/code.org/public/company-profiles/splat.haml