Automatically built.

commit f12623994cbac82a5376d3c170f5b14b409bc03a
Merge: 96a1b73 33b7bbe
Author: cpirich <chris@code.org>
Date:   Mon Nov 3 12:44:43 2014 -0800

    Merge pull request #317 from code-dot-org/droplet_fixes

    Droplet fixes

commit 96a1b73ada26ef59ad69a1a4cf719116c2a0c956
Author: Continuous Integration <dev@code.org>
Date:   Mon Nov 3 20:30:27 2014 +0000

    Automatically built.

    commit e9e239b78ac894d180796ca2252a67dfabc5039e
    Merge: 05d3869 438ec36
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Mon Nov 3 12:10:55 2014 -0800

        Merge pull request #316 from code-dot-org/questionableBlocks

        add a couple of dropdowns with ???

    commit 05d3869c3640a7e6c227ffb24318fed68bb527a7
    Author: Tanya Parker <tanyacparker@gmail.com>
    Date:   Mon Nov 3 12:08:27 2014 -0800

        typo in teacher section localization

commit e9e239b78ac894d180796ca2252a67dfabc5039e
Merge: 05d3869 438ec36
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Nov 3 12:10:55 2014 -0800

    Merge pull request #316 from code-dot-org/questionableBlocks

    add a couple of dropdowns with ???