Automatically built.

commit 336c50d3d978954fbda34d9bde007938d979a41b
Merge: 1c0c29c e628725
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 5 10:45:39 2014 -0800

    Merge pull request #322 from code-dot-org/function_editor_modal

    [Finishes #80924274] Add blockly modal function editor

commit e628725dcc98dda0572a64c64f16292df0810d7b
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Nov 5 10:40:11 2014 -0800

    Fix `grunt test` errors

commit 1c0c29c313e62ddaec87538f2e84d32056bedb5c
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 5 17:37:57 2014 +0000

    Automatically built.

    commit 8008592af586eb21c344b357ce3a43e0de3582a8
    Merge: bf0deca ffe5153
    Author: cpirich <chris@code.org>
    Date:   Wed Nov 5 09:17:15 2014 -0800

        Merge pull request #326 from code-dot-org/webapp_apis

        add new APIs for webapp

    commit bf0deca8d8f4f06134eccdb2dc70da8cacaef143
    Author: Continuous Integration <dev@code.org>
    Date:   Wed Nov 5 15:39:39 2014 +0000

        Dropbox changes.

commit 8008592af586eb21c344b357ce3a43e0de3582a8
Merge: bf0deca ffe5153
Author: cpirich <chris@code.org>
Date:   Wed Nov 5 09:17:15 2014 -0800

    Merge pull request #326 from code-dot-org/webapp_apis

    add new APIs for webapp

commit bf0deca8d8f4f06134eccdb2dc70da8cacaef143
Author: Continuous Integration <dev@code.org>
Date:   Wed Nov 5 15:39:39 2014 +0000

    Dropbox changes.

commit 000dbfb001ae71ef340c66cb832e3db0d9cba365
Merge: fa43521 83ec02e
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Nov 5 07:30:59 2014 -0800

    Merge branch 'production' into staging

commit 83ec02e7c10148df12e563e7a060e5f32db72b45
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Nov 5 07:28:08 2014 -0800

    Fix for domains that end in dots and simplified logic for rewrite domains.

commit fa43521bcfd96daa8176f734e7c0218ca7079027
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Wed Nov 5 07:28:08 2014 -0800

    Fix for domains that end in dots and simplified logic for rewrite domains.

commit 88d7c2e1ca227ab32df9a4fde549ced11f1fe12c
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 5 00:25:42 2014 -0800

    add cours4 to k5 course list

commit 169f836fdb14d3d754bf251cd4db1e27dc06e09b
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 5 00:13:05 2014 -0800

    reorder unplugged in course 4 script

commit 146c1b5d10b2ac50b64b3dfc77aa84986e2c1e37
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 5 00:06:05 2014 -0800

    add unplugged activities to course 4 script

commit baccab5b67c929bb6cc6aa3701ba472019508e49
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Nov 5 00:01:57 2014 -0800

    add unplugged activities to course 4 script

commit 5e26ad25b214593f479dea3b7b220bdd531533f0
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 23:51:27 2014 -0800

    rename course 4 curriculum folders

commit 6633cf8af85a3b5f9b590cb37a3e85de860eee11
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 22:49:51 2014 -0800

    Fix uncaught exception on levels without categories

commit 70d11f1a70cfc17211953fdcf44bf2d7fc3b990c
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 22:22:33 2014 -0800

    Code review feedback

commit d146eeac67d067c90bc722b9a323fc48edd3e563
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 21:46:37 2014 -0800

    Formatting: wrap at 80 characters

commit 9bae920134fe88a7865fdd352976929433b92551
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 18:11:12 2014 -0800

    test for prod regression

commit adb5a106cfb4660b3ab7229fc894daddfd735d8d
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 17:55:37 2014 -0800

    I18n for function contract strings

commit 3ca0c37b9ce260bfbe813cb91ca2a940f104b436
Merge: 0f57d8e acfddaa
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 17:36:58 2014 -0800

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

    backmerge hotfix

commit acfddaa757578086b2141989ea64e77a51f3e1c8
Merge: a49a133 70c60f5
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 17:36:26 2014 -0800

    Merge pull request #338 from code-dot-org/production

    backmerge hotfix

commit 70c60f5de9ecf79f9b9f6265333fa35e0fc7c804
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 17:25:17 2014 -0800

    hotfix -- typo

commit 0f57d8ebda7ed0ea144c0110c1845fa8dc067391
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 17:19:54 2014 -0800

    restyle language lightbox

commit 3346ec86822d4db86a3587dfb785798eba225303
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 17:14:07 2014 -0800

    RTL-enable the modal function editor

commit b7fbdcad5f35b01441e29403e90cf3dedbf99fff
Merge: 7ddd756 a49a133
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 4 17:10:59 2014 -0800

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

    11/04/2014 DTP

commit fa3ec703a40737fa7c9f578523beb9e9a304c02c
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 16:25:25 2014 -0800

    no I can't

commit 1ec259987c219df5eabce545de58afa9c4f2ebd6
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 16:24:43 2014 -0800

    see if I can make a search form for docs directory

commit 1979409bcae898dd1275db945589b488ae8f58ae
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Nov 4 16:07:57 2014 -0800

    Update update-levelbuilder.md

    add pointer to existing levelbuilder docs

commit 4d78bae42f208a79448221b2638a99d2945d0bdc
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Nov 4 16:04:23 2014 -0800

    Update update-levelbuilder.md

commit d05b11e1fd2f3e10f914298640c398aa1016740e
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Nov 4 16:02:52 2014 -0800

    Create update-levelbuilder.md

    How to update levelbuilder, courtesy of Brent

commit 23bb5431058f0c0ca141e8a8a69d9e9b02294c01
Merge: 77596f9 d035c9f
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Tue Nov 4 15:46:13 2014 -0800

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

    level builder changes

commit d035c9fe8c7fa1adb7a6dac02f66bd76a152b62c
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 23:45:10 2014 +0000

    level builder changes

commit 77596f928f057030d25b43a917a3b8b4e5621efc
Merge: 279ccc2 7e07830
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Nov 4 15:42:04 2014 -0800

    Merge pull request #334 from code-dot-org/playlab-levelbuilder

    make functional blocks available in levelbuilder for playlab

commit 279ccc2d890e847af4f92b2faae395cb7db366cf
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 15:34:32 2014 -0800

    sql-writer bin scripts

commit 7e078302303c1aa240ebf622c402b9c42ebf970d
Author: David Bailey <dsb123@gmail.com>
Date:   Tue Nov 4 15:33:02 2014 -0800

    make functional blocks available in levelbuilder for playlab

commit 97132f43a42b95d4d3848b39d35d2880c9da3ffb
Merge: 3e21d3c f7cf7a1
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 15:25:28 2014 -0800

    Merge pull request #333 from code-dot-org/fix-impressive

    fix 'false' -> false for impressive setting

commit f7cf7a19471a35192262c7903a2fd2e41a0732a1
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 15:24:59 2014 -0800

    test

commit a95458f64dcefe5f0266691fbfad61438be0ef88
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 15:22:39 2014 -0800

    Fix remaining static toolbox reference

commit 543db4c8f016c8801e50305eb0d73706570809fa
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 15:14:50 2014 -0800

    fix 'false' -> false for impressive setting

commit 3e21d3c5cfc078abc01fa1029302cb5a49badb07
Merge: 384c3d6 07f7f73
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Tue Nov 4 15:13:08 2014 -0800

    Merge pull request #332 from code-dot-org/videos

    video changes

commit 07f7f738bad911316cd464ec94a0161ea80fc598
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Tue Nov 4 15:07:14 2014 -0800

    video changes

commit 47740705239e32c82d873ed255a3c8615273bbbd
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 15:10:33 2014 -0800

    Rename some remaining workspace -> blockSpace usages

commit a49a133ad53c525722c19fa2fccb3e0ad04849dd
Merge: 43b307d 384c3d6
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 4 15:05:29 2014 -0800

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

    11/04/2014 DTT

commit d4c714f0583266cd036afe6f747b79016fa31046
Merge: 468a916 dabbc5a
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 15:00:43 2014 -0800

    Merge remote-tracking branch 'remotes/origin/staging' into function_editor_modal

    Conflicts:
    	blockly/src/base.js
    	blockly/src/calc/calc.js
    	blockly/src/turtle/turtle.js
    	blockly/src/webapp/webapp.js
    	dashboard/app/helpers/levels_helper.rb

commit 384c3d6d778bca322782b64291696d22c39668a6
Merge: 90b06de e344b2a
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 14:56:42 2014 -0800

    Merge pull request #328 from code-dot-org/video-title

    fix typos in video name strings

commit 90b06de67734aee7cee7d8dffb901b7cbdc0ee7a
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 22:55:07 2014 +0000

    Automatically built.

    commit 94da9ce302a0c5db1206743c25768dd9b0f3334f
    Merge: b6437a2 3b65ce9
    Author: Tanya Parker <tanyacparker@gmail.com>
    Date:   Tue Nov 4 14:32:09 2014 -0800

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

    commit b6437a279f76081de878e63688b0c7b494d802c4
    Author: Tanya Parker <tanyacparker@gmail.com>
    Date:   Tue Nov 4 14:31:43 2014 -0800

        translations 11/4

commit 468a9162799da2ff2993f431b4cde31b7342278d
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 14:48:01 2014 -0800

    Filter defs svg was covering language select

commit dabbc5ab6be4d7de6cb376a168e8b6ad54973f42
Merge: 29143e5 8c45b11
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Tue Nov 4 14:43:06 2014 -0800

    Merge pull request #330 from code-dot-org/testFix

    fix rake test

commit 8c45b11e6edcbbeab42baadfbdd2f818fbe87ec4
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Tue Nov 4 14:37:34 2014 -0800

    fix rake test

commit 29143e5925a8bc25ec87cdb0865092762264e632
Merge: 94da9ce f8f4aa1
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 4 14:36:10 2014 -0800

    Merge pull request #329 from code-dot-org/hoc-prizes-images-gallery

    Hoc prizes images gallery

commit f8f4aa14b3c1d0a26efdc0679d53039f9017a645
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 4 14:32:57 2014 -0800

    Changed button text.

commit d4cec6972d11db6a6acc48ffe3567227229b3132
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Tue Nov 4 14:32:44 2014 -0800

    Added view for video chat speakers grid.

commit 94da9ce302a0c5db1206743c25768dd9b0f3334f
Merge: b6437a2 3b65ce9
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 14:32:09 2014 -0800

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

commit b6437a279f76081de878e63688b0c7b494d802c4
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 14:31:43 2014 -0800

    translations 11/4

commit 4137a3108b9cb66e738276bba3a4f614333cd11c
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 14:18:22 2014 -0800

    Remove setTimeout in parameter delete

    Return `null` to prevent additional change callbacks from being called.

commit 3b65ce93b5ff25d67bdfe8b54a714890989be5bd
Merge: 1b8db7d c722a9f
Author: Laurel <laurel.fan@gmail.com>
Date:   Tue Nov 4 14:17:03 2014 -0800

    Merge pull request #262 from code-dot-org/new-progress

    new user progress

commit 1b8db7d79cf35b33a08dd32e2c58416b9566da50
Merge: 43b307d b9b7d4b
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Tue Nov 4 14:15:43 2014 -0800

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

commit 43b307de953c103823f5f48f1c8895752c51543b
Merge: a63eba7 7ddd756
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Tue Nov 4 14:15:29 2014 -0800

    Merge branch 'production' into test

commit 7ddd7565914dae3d1b1e4c75363daba50ccdd6f4
Merge: 155a8e8 70b7a6a
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Tue Nov 4 14:15:14 2014 -0800

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

commit 155a8e87fdda6f39c0466186f4ee9af6a3423d07
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Tue Nov 4 14:15:08 2014 -0800

    Hotfix for PD emails

commit b9b7d4bd66a0da8db28b50b25547e697093380fa
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Tue Nov 4 14:05:57 2014 -0800

    Fixed typo in header.

commit 70b7a6af5974bc48ac71e9979cfb1f3be153f6ff
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 22:00:00 2014 +0000

    Email tweaks

commit 524138077ecedf5847eeea5c6671e9b39eb4797e
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 13:53:23 2014 -0800

    remove css include from language lightbox

commit 01a562fd37f42666d94ffd971ae7cf23e60c1041
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Nov 4 13:48:52 2014 -0800

    Use .textContent instead of .innerHTML for SVG nodes (fixes IE)

commit c722a9fb352360a91f8530f7f8c6e25d83e2bb7f
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 13:44:47 2014 -0800

    ignore ui test log files

commit 061fd52f8dd0bef68ddf55476c9264265b9189ad
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 13:37:12 2014 -0800

    cross browser tweak

commit 180d6023fa1adc26a626df50adb7a202e42f3cb6
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 13:35:03 2014 -0800

    Style and refactoring changes from code review
     - Remove some block space editor private variable references in function_editor and utils.js
     - Add names to some TODOs

commit 9dfd01dcd41baade2cb141d28b8b94104ee9120e
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 13:29:21 2014 -0800

    make header fit on <1150px

commit a0e3e8955d0ced21c931fffb3a4065f3cc7f3c19
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 13:27:07 2014 -0800

    make header progress narrower, add Stage # to all script stage names

commit a63eba7c15e4422dfa7a21dc5fa1df03f30009c4
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 21:23:41 2014 +0000

    Prizes

commit a66587b38986192d8eb972b682eee35e662a32dc
Merge: f5d2bef 0d1aba7
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Tue Nov 4 13:08:44 2014 -0800

    Merge branch 'test' into staging

commit 4bb7a0be1a574345daff7dd4964c01ebf3fcbca2
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Tue Nov 4 13:07:54 2014 -0800

    DTP for email

commit 80e1bd9499d51a5a7da1b47d39dec980ab6438c9
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 13:02:25 2014 -0800

    Feedback from review:
    - Use public method for flyout height getter, setMovable for definition block
    - Use function editor container presence as proxy for open status

commit 5dc4aed3c7bf0b761710f2ede6fc03642b0c2573
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 13:00:32 2014 -0800

    Remove description declaration from Block (currently applies to procedures only)

commit 1c1d3f583b948a6d2cba7af86b5cda2b6622e0b5
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 12:32:52 2014 -0800

    Refactor add parameter text event handling code

commit 679fb6a4beb4204c765acf5fa9a4294fc766d233
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 12:19:09 2014 -0800

    Move property declarations to constructors

commit fb8723f2ee7c5c4f835c34d6ea648aaaaf8dd430
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 11:56:41 2014 -0800

    Small non-functional code review style changes:
    - indentation
    - ==/===s
    - removal of inline comments
    - inlining variable changes

commit 7cd3cfd474fec4197b562d5ef4133234417dba61
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Tue Nov 4 11:48:30 2014 -0800

    Style / structure changes from code review
    - Move FieldParameter to its own file
    - Extract methods in BlockSpaceEditor's flyout initialization code
    - Add some documentation to procedure block method definitions

commit e344b2a10667fa2283d2f413aebc53ca2814c05c
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Tue Nov 4 11:31:26 2014 -0800

    fix typos in video name strings

commit f5d2bef51b61f51b8719aff96c04c1191b1c9786
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 18:12:09 2014 +0000

    Automatically built.

    commit 985163e0bb0e82e536923326b720e91d66da1b6b
    Merge: dd20a0d bb390d3
    Author: davidsbailey <davidsbailey@users.noreply.github.com>
    Date:   Tue Nov 4 09:51:06 2014 -0800

        Merge pull request #312 from code-dot-org/playlab-functional-blocks

        Add functional blocks to playlab to set background, title, and player/enemy speed.

    commit bb390d30e518195922c7c017000c8ae9d4e87cbe
    Author: David Bailey <dsb123@gmail.com>
    Date:   Mon Nov 3 16:26:28 2014 -0800

        fix jshint

    commit 57324d2f4a597ec2d22f3ca40c3f6cff36f23945
    Author: David Bailey <dsb123@gmail.com>
    Date:   Mon Nov 3 16:21:09 2014 -0800

        move mathBlocks.js to sharedFunctionalBlocks.js

    commit efc249d0cfeed2165fd6d0c67d529f9eab21618e
    Author: David Bailey <dsb123@gmail.com>
    Date:   Mon Nov 3 15:43:51 2014 -0800

        touch up playlab functional blocks: remove _.partial; move installString to mathBlocks; eliminate extraArgs; touch up speed max/min logic.

    commit 449d118d72cfabf988cfb2abcbdbc4815da642eb
    Author: David Bailey <dsb123@gmail.com>
    Date:   Fri Oct 31 18:18:15 2014 -0700

        Add functional blocks to playlab to set background, title, player speed, enemy speed.

commit f4597e066c5aefac96245b3d925bd0f99a1b228f
Merge: be44e16 9b395c0
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 18:12:04 2014 +0000

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

commit 9b395c03c13197365b51f6dc9faefda34c92eb93
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 10:08:33 2014 -0800

    language lightbox string

commit be44e163048b2ecc8680ff4599e1e7a45023e4bd
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 17:59:27 2014 +0000

    Dropbox changes

commit ad3c8d3cc133dc11e6aeecb6e4eaec7abec6cf92
Merge: 3ab6d1f a5339de
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 09:59:13 2014 -0800

    Merge pull request #327 from code-dot-org/i18n

    i18n updates

commit 3ab6d1fc60ae11890c180b5e90d28d71b43fde2c
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 17:58:48 2014 +0000

    add string for language lightbox

commit a5339dee42642b2159b2701d409bc75376fe9e93
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 09:52:58 2014 -0800

    UI for language lightbox

commit 985163e0bb0e82e536923326b720e91d66da1b6b
Merge: dd20a0d bb390d3
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Nov 4 09:51:06 2014 -0800

    Merge pull request #312 from code-dot-org/playlab-functional-blocks

    Add functional blocks to playlab to set background, title, and player/enemy speed.

commit b486152e38426b04625536414a1314267125b0a2
Merge: 7d815ee dd20a0d
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Tue Nov 4 09:49:29 2014 -0800

    Merge branch 'staging' into i18n

commit bb390d30e518195922c7c017000c8ae9d4e87cbe
Author: David Bailey <dsb123@gmail.com>
Date:   Mon Nov 3 16:26:28 2014 -0800

    fix jshint

commit 57324d2f4a597ec2d22f3ca40c3f6cff36f23945
Author: David Bailey <dsb123@gmail.com>
Date:   Mon Nov 3 16:21:09 2014 -0800

    move mathBlocks.js to sharedFunctionalBlocks.js

commit efc249d0cfeed2165fd6d0c67d529f9eab21618e
Author: David Bailey <dsb123@gmail.com>
Date:   Mon Nov 3 15:43:51 2014 -0800

    touch up playlab functional blocks: remove _.partial; move installString to mathBlocks; eliminate extraArgs; touch up speed max/min logic.

commit 449d118d72cfabf988cfb2abcbdbc4815da642eb
Author: David Bailey <dsb123@gmail.com>
Date:   Fri Oct 31 18:18:15 2014 -0700

    Add functional blocks to playlab to set background, title, player speed, enemy speed.

commit ffe51537270a4db0b38484107b3da2eff5793bdc
Author: cpirich <chris@code.org>
Date:   Mon Nov 3 21:28:17 2014 -0800

    add new APIs for webapp

commit dd20a0d7a738a6e4205a1dd4fae601cfaee51f44
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 03:21:26 2014 +0000

    rename activity files in csteacher

commit ece71c8b537c790dbb21c3bd8e3b692467774a0f
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Mon Nov 3 18:04:18 2014 -0800

    Changes from code review:
    - Try to receive SVG element from caller when translating coordinates
    - Remove onChangeHandle and workspace transfer code (unused)

commit ba3b3f9d6172a0ea52bde71551e97dcccd0041ea
Merge: 4c8a55e 5948691
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Mon Nov 3 17:21:16 2014 -0800

    Merge pull request #325 from code-dot-org/all-donors-page-sizing-fix

    quick sizing fix for Ballmer on all donors page

commit 59486913d48842c9ac9f0dc2e6bbd2a43500c576
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Mon Nov 3 17:20:27 2014 -0800

    quick sizing fix for Ballmer on all donors page

commit 743aaadf31393b27b6d5d8c5e0c625b322a336fb
Merge: 466bbba 0d1aba7
Author: Josh Lory <josh.lory@code.org>
Date:   Mon Nov 3 17:17:22 2014 -0800

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

    DTP

commit 4c8a55e14c00f5501065a1ba0c668a0db09721e9
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 01:08:50 2014 +0000

    move activity pdfs to csteacher folder

commit 5b1de58bc35cd9f4b4e7abbbe23f41a226ba845b
Merge: e1fd775 865c6ee
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 01:05:51 2014 +0000

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

commit e1fd775fb88c9f252478d3333417e2b5d1c8bd6f
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 01:05:44 2014 +0000

    prizes merge conflict

commit 8813ff2ae7c3dc391f3dacb5b4be83d7edb6c116
Author: Continuous Integration <dev@code.org>
Date:   Tue Nov 4 01:04:48 2014 +0000

    prizes merge conflict

commit 865c6ee0a1a1d4195c5111fac6a0312e6c86f141
Merge: e28fdff 1f5a549
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Mon Nov 3 16:54:31 2014 -0800

    Merge pull request #323 from code-dot-org/hoc-button-fix

    Hoc button fix