Proper magic offsets & in-front/behind drawing for Elsa's sparkle.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging