Automatically built.

commit 22278e5408bd32d88a1ea2106de86b29407db69b
Merge: 35ff3af dfaca72
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 13:08:51 2014 -0800

    Merge pull request #666 from code-dot-org/functional_examples

    [WIP] Functional examples

commit dfaca725ee891d10ea23c502a9b747fd18928425
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 13:01:05 2014 -0800

    Fix issue from merge

commit bb216a4ea54c1ed0adc573c976e62f016fdaccb3
Merge: 292a0b2 35ff3af
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 12:37:54 2014 -0800

    Merge remote-tracking branch 'origin/development' into functional_examples

    Conflicts:
    	blockly-core/core/block_svg.js
    	blockly-core/core/function_editor.js

commit 292a0b2fd4549728d06410e740253ff500b98d24
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 12:27:48 2014 -0800

    Open existing examples when opening contract editor

commit 35ff3af23baadce7347a3176e397cf0d033537ce
Author: Continuous Integration <dev@code.org>
Date:   Thu Dec 4 20:02:47 2014 +0000

    levels that thi made on development instead of levelbuilder

commit 9b0b2a09af16544259fdbd6566130076d1a83335
Merge: fec1508 95fe112
Author: Will Jordan <will@code.org>
Date:   Thu Dec 4 11:50:11 2014 -0800

    Merge pull request #667 from code-dot-org/83360590_contract_match

    [Delivers #83360590] new Contract Match level type for MSM assessment

commit 5ebd114d105ea517f1291767b0b6418bed756436
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 10:38:05 2014 -0800

    Space before name in error log

commit d476c7a41b2f1392c8d8e7160c4f2ec8526c9686
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Dec 4 10:36:56 2014 -0800

    Localize 'Definition' string in contract editor

commit fec15089b3f1638b32e80fd6b0c67263671e1688
Merge: 9f27435 b677d20
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 21:07:24 2014 -0800

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

commit b677d20f9f2352d51af18f2663aa24b824a9b33a
Merge: e4d4ae9 aa00040
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 21:06:04 2014 -0800

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

commit aa0004074d59cd89ed0c3dae0faeddc88abc6260
Author: Continuous Integration <dev@code.org>
Date:   Thu Dec 4 05:04:58 2014 +0000

    Fix unsubscribers script.

commit 9f274351a2b9441e6f3eb0ba8601886d07d504a3
Author: Continuous Integration <dev@code.org>
Date:   Thu Dec 4 04:41:06 2014 +0000

    Automatically built.

    commit 422062cf22f9c51f4e800dbc26a8002f35654a38
    Author: Geoffrey Elliott <geoffrey@code.org>
    Date:   Wed Dec 3 20:13:29 2014 -0800

        Integrate blockly on development branch.

commit e4d4ae90c3c9c1fba82a97cd22a104b7f64b41e3
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 20:38:07 2014 -0800

    Don't include levelbuilder and development hosts in lines-of-code counting.

commit 2a2922086241b4500bd5085f9a9fe5709c473ff5
Merge: ffff716 de38fda
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 20:34:00 2014 -0800

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

commit de38fdaaa74e2092bbbd97e04ed3ae162c055447
Author: Continuous Integration <dev@code.org>
Date:   Thu Dec 4 04:33:30 2014 +0000

    Dropbox changes, geoffrey@code.org

commit 422062cf22f9c51f4e800dbc26a8002f35654a38
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 20:13:29 2014 -0800

    Integrate blockly on development branch.

commit 07d5c0537f5da1f82f25f2dfca02059cf222cc3e
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 20:11:36 2014 -0800

    Silence a noisy debug string.

commit 478cba27e51f016831e77a027070c287df4d842b
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 20:01:39 2014 -0800

    Varnish fix for development instance.

commit c1459f6df387425b132cbd0ec19ca7c6a9c43671
Merge: 29ac133 ffff716
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Dec 3 19:37:19 2014 -0800

    Merge pull request #665 from code-dot-org/test

    DTP

commit 7fd7163a8ad3a630cf4e1537f8aec4965c45e600
Merge: afd8510 a3d7e7c
Author: Geoffrey Elliott <use-github@geoffreyelliott.com>
Date:   Wed Dec 3 19:34:54 2014 -0800

    Merge pull request #661 from code-dot-org/seed-incremental

    split seed:all into seed:all and seed:incremental

commit a3d7e7c04ad8a65a3755af45977ce73bfd589bd3
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Dec 3 19:33:04 2014 -0800

    Use seed:incremental and seed:all appropriately.

commit ffff7162683780e0a4aff1b165804b459be098fb
Merge: 284d6f0 afd8510
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Dec 3 19:11:53 2014 -0800

    Merge pull request #663 from code-dot-org/staging

    DTT

commit 89cabec473c8f1a20a086dd472c3e07f72c49efa
Author: Laurel <laurel.fan@gmail.com>
Date:   Wed Dec 3 19:07:11 2014 -0800

    Update seed.rake

commit afd851029883566a4a07c170c4d350576bac6285
Merge: 8ccc8b4 49a27c4
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Dec 3 19:03:05 2014 -0800

    Merge pull request #662 from code-dot-org/levelbuilder

    Levelbuilder -> staging