stop the build on test if dashboard unit tests fail
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Automatically built.

commit e6490bc15f1c7490f34220a1243322181e9f09f5
Merge: 31085df 0a109ff
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Nov 14 10:33:37 2014 -0800

    Merge pull request #434 from code-dot-org/fixunittest

    Fix `rake test` failures

commit 0a109ff59a8278fdf72f0aebbd8bd3a3ef5c7775
Author: Josh Lory <josh.lory@code.org>
Date:   Fri Nov 14 10:26:34 2014 -0800

    Fix `rake test` failures

    Laurel is working on a fix to make progress specific to scripts (rather
    than just levels).

commit 31085dfa84312eeafb35dcb103a66f612c55e517
Merge: b5802a2 bc1ebbb
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Nov 14 10:18:49 2014 -0800

    Merge pull request #433 from code-dot-org/evalBuilder

    couple little fixes for eval level builder

commit b5802a26bca8f85a06d9bfd1abc94cafd741252c
Merge: 3be4770 5484ca4
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Fri Nov 14 10:14:42 2014 -0800

    Merge pull request #432 from code-dot-org/procedural-to-functional-call

    add procedural calls to functional functions in levelbuilder mode.
calc functions being ignored
Merge pull request #436 from code-dot-org/calcFns

calc functions being ignored
Dropbox changes
Automatically built.

commit 6515904214bd54c8d7f3f64ca6404b3173857dbb
Merge: 6c01b64 02a64c5
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Nov 14 11:30:00 2014 -0800

    Merge pull request #436 from code-dot-org/calcFns

    calc functions being ignored

commit 02a64c5c0208af29f526a46e6e579d56519ab03f
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Fri Nov 14 11:02:40 2014 -0800

    calc functions being ignored
dont show wallPegman to start for Scrat
Merge pull request #437 from code-dot-org/doubleScrat

dont show wallPegman to start for Scrat
Automatically built.

commit 911a5f9c748bb38d8c02f3aed4c9eccbe0e45363
Merge: 8486090 9bddedd
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Fri Nov 14 11:57:35 2014 -0800

    Merge pull request #437 from code-dot-org/doubleScrat

    dont show wallPegman to start for Scrat

commit 9bddedd0f2d46b35fd252a1cfccb00cc1e8c076d
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Fri Nov 14 11:53:36 2014 -0800

    dont show wallPegman to start for Scrat
Merge branch 'test' into staging
add concepts to the old hoc levels in the new hoc script so the videos don't disappear from the old levels
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
autorerun tests
Merge pull request #438 from code-dot-org/staging

DTT