Checkpoint.
Bug fixes.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into activity
Automatically built.

commit 93d370f8bfabb938b89ed8197abb637b4be8b7ea
Merge: 91c8c56 123a4b0
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Thu Dec 4 16:37:51 2014 -0800

    Merge pull request #682 from code-dot-org/calloutString

    new frozen callouts

commit 91c8c563d9ed6f5f80a50da959d47dc8ff955376
Merge: d5fce40 2d7c003
Author: breville <breville@users.noreply.github.com>
Date:   Thu Dec 4 16:37:27 2014 -0800

    Merge pull request #681 from code-dot-org/frozencanvascopyright

    Add copyright text to the Frozen background images.

commit 123a4b07612c09020d6bd068dde8cfd8f3a664d0
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Thu Dec 4 15:32:51 2014 -0800

    new frozen callouts

commit d5fce40eab6f0ad26b8e7bd1754d21de7ef919fa
Merge: 35934ab de1ca73
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Thu Dec 4 16:35:25 2014 -0800

    Merge branch 'test' into staging
fix hourofcode.com i18n how-to syntax errors
Email
Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging
- Change Shapeways icon to "3D"
- Add disclaimer step to Shapeways button flow
Only show shapeways when send ot phone is enabled
Updated levelbuilder instructions.
Merge pull request #685 from code-dot-org/shapeways_disclaimer

Update Shapeways button flow
Made easier to read.
Automatically built.

commit 26283e771cdc33b0c4159fe6a48fc878e4242020
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Thu Dec 4 17:34:37 2014 -0800

    Made easier to read.

commit 9290c1533c2baad34ec71f47a126735335a37ab9
Merge: 70129f6 618704a
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 17:34:20 2014 -0800

    Merge pull request #685 from code-dot-org/shapeways_disclaimer

    Update Shapeways button flow

commit 70129f66d30dcf9783b83b6cdb1051f6db72d10a
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Thu Dec 4 17:28:15 2014 -0800

    Updated levelbuilder instructions.

commit 618704aab6047be507987f8c2d5e0c8154ce28fd
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 17:22:31 2014 -0800

    Only show shapeways when send ot phone is enabled
Varnish for levelbuilder-dev
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into activity
Add country and state columns for compatibility with analysis scripts.
Dropbox and Gsheet changes
added callout strings for course 4
Analyze script updated.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into activity