Add basic callout support to levelbuilder (defined via JSON)
don't use Blockly at all on editCode levels
Merge pull request #404 from code-dot-org/hourofcode

add khanacademy, tfa, and mesa company pages
new dropdown number block
Merge pull request #405 from code-dot-org/functionalNumberDropdown

new dropdown number block
PR feedback: add comments
Merge pull request #403 from code-dot-org/editCode_no_blockly

don't use Blockly at all on editCode levels
Add test and fix bug with empty callouts
Automatically built.

commit 7bf11e6a932745578ec6d374734007f0f6fd6195
Merge: 25bf787 7d68165
Author: cpirich <chris@code.org>
Date:   Wed Nov 12 11:19:41 2014 -0800

    Merge pull request #403 from code-dot-org/editCode_no_blockly

    don't use Blockly at all on editCode levels

commit 7d6816535c6fc4c8f8bb1dfc72010ad81a8cb7c6
Author: cpirich <chris@code.org>
Date:   Wed Nov 12 11:13:20 2014 -0800

    PR feedback: add comments

commit 25bf7871e781252bdc33969524dd3d57b9b31952
Merge: 8ce5f4c 24c4471
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Nov 12 11:00:22 2014 -0800

    Merge pull request #405 from code-dot-org/functionalNumberDropdown

    new dropdown number block
Code review feedback
more copy changes to educate2
Combine seen callouts logic
[Finishes #82528294] highlight calc blocks as we evaluate
@level.callout_json doesn't exist for e.g. unplugged levels
Merge pull request #399 from code-dot-org/levelbuilder-callouts

Add basic callout support to levelbuilder (defined via JSON)
Merge pull request #408 from code-dot-org/hourofcode

add palestine, africa, and asia pacific pages to hoc.com
Merge pull request #407 from code-dot-org/calcHighlight

[Finishes #82528294] highlight calc blocks as we evaluate
edited bullet points in educate2
Merge pull request #406 from code-dot-org/morechangestoeducate2

more copy changes to educate2
Automatically built.

commit bbb83f1db7263334a8174226d7fff7b73a2a3598
Merge: abef571 7ca2ca5
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Nov 12 12:35:38 2014 -0800

    Merge pull request #407 from code-dot-org/calcHighlight

    [Finishes #82528294] highlight calc blocks as we evaluate

commit abef571271c8de107b3acae7bfb2cf94d6be9be3
Merge: 4da1943 77a5660
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 12 12:33:30 2014 -0800

    Merge pull request #408 from code-dot-org/hourofcode

    add palestine, africa, and asia pacific pages to hoc.com