Initial work on special Frozen "carousel" for code.org/learn.
Small updates to frozen carousel: infinity logo back; only show for English until translated.
Add Scrat to hour of code carousel bar for full desktop width displays.  For fun.
Let's make the tiny Scrat blink.  For fun.
Update studio.code.org with hoc2014 blocks, course4, and other improvements.
Update studio.code.org with four blocks for hoc2014, course4 block, new course1-4 info about age range, and lighten blocks to match studio bar on code.org.
Merge branch 'staging' into frozencarousel

Conflicts:
	pegasus/sites.v3/code.org/public/learn/index.haml
Minor aesthetic improvements to frozen carousel entry.
More improvements to studio.code.org and nearby pages.
Report device pixel ratio as a new custom variable to Google Analytics.
Add functional string comparison block

Took a swing at making the block myself
Fit level edit text inside new narrow header
Merge branch 'levelbuilder' into staging
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Added 'Powered by Amazon Web Services' to footer of studio.code.org.
lowercase 'string'
multi.en.yml merge conflict
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Automatically built.

commit 99ed195dc51a995c2f022e18c44da9e7c87972b7
Merge: 67acdf6 f640e1b
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Dec 1 14:32:35 2014 -0800

    Merge pull request #596 from code-dot-org/wildcardMathBlock

    handle ??? in math_number block

commit f640e1b52f94140b47f266bd29a77946cebe84b4
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Mon Dec 1 14:32:13 2014 -0800

    handle ??? in math_number block

commit 67acdf632699a7b8eda1da8df4bbb8a02c0a054b
Merge: cd30082 2c1128f
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Mon Dec 1 14:18:26 2014 -0800

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

commit cd30082e13cb33d5f157fe7d857bb3168f779db9
Merge: cd77395 d7c5fcd
Author: Laurel <laurel.fan@gmail.com>
Date:   Mon Dec 1 14:17:49 2014 -0800

    Merge pull request #593 from code-dot-org/check-videos

    when seeding videos, check that all videos have names in data.en.yml

commit cd7739530c2e2ff46685c3103a13d69ef87dcb38
Author: Josh Lory <josh.lory@code.org>
Date:   Mon Dec 1 14:15:50 2014 -0800

    Make 'text' block availible in Artist levelbuilder

commit 2c1128f35beb18f88347e9346aa2632f19a8cbf4
Author: Continuous Integration <dev@code.org>
Date:   Mon Dec 1 22:11:53 2014 +0000

    Keep updates under 20% of instances at a time.

commit d7c5fcd7b7a0d2819a21dca6fa24cc8cf22a4fa2
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Mon Dec 1 14:10:39 2014 -0800

    when seeding videos, check that all videos have names in data.en.yml

commit c30711d215839d25a42ab52807c2305ba2f7b996
Author: Continuous Integration <dev@code.org>
Date:   Mon Dec 1 22:06:39 2014 +0000

    Emails with litmus ids
misc bug fixes
Update en_us.json