Dropbox changes.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Automatically built.

commit 138c22a3f9398c12e7ad8dcb1e3343c09037f9fc
Merge: 6dda2e3 ecf2849
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Nov 20 13:36:31 2014 -0800

    Merge pull request #507 from code-dot-org/functional_variables

    Add functional variable editor

commit 6dda2e39683bda5f5fa47ac1394cab7ea2eb6874
Author: Continuous Integration <dev@code.org>
Date:   Thu Nov 20 21:32:15 2014 +0000

    Automatically built.

    commit 2204678ba3e118adedd1fe35622e91431f5ffced
    Author: Will Jordan <will@code.org>
    Date:   Thu Nov 20 12:52:20 2014 -0800

        convert ResizeSensor to browserify/node module.exports syntax

commit ecf28490e0ee4f90bf59d89e951d9820af4ec927
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Nov 20 13:31:05 2014 -0800

    Add functional variables to studio available blocks

commit 5757de7f0aab31643f79f090154560b1ed199ddb
Merge: 2204678 2f70669
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Thu Nov 20 13:28:13 2014 -0800

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

commit 2f70669f79982f8468df789e069746a78a3d68e0
Merge: 61ec88a 316b556
Author: Geoffrey Elliott <geoffrey@code.org>
Date:   Thu Nov 20 13:27:59 2014 -0800

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

commit 316b556ea832d1876276d2b990b37a31fc4cff52
Author: Continuous Integration <dev@code.org>
Date:   Thu Nov 20 21:27:38 2014 +0000

    Better stats.

commit 2e95f2fa3ed9502bc91006993c3acd83151bc7c2
Author: Continuous Integration <dev@code.org>
Date:   Thu Nov 20 21:26:40 2014 +0000

    Old email

commit dd5cee50563ee1399cf437a9ec750cd29d90cb39
Author: Continuous Integration <dev@code.org>
Date:   Thu Nov 20 21:25:17 2014 +0000

    Email changes.

commit c5de2327a5cbead933e61f86ed8b12bcc973779e
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Nov 20 12:52:51 2014 -0800

    Fix UI show / update order
    - Change "Range" to "Type" for functional variables

commit 2204678ba3e118adedd1fe35622e91431f5ffced
Author: Will Jordan <will@code.org>
Date:   Thu Nov 20 12:52:20 2014 -0800

    convert ResizeSensor to browserify/node module.exports syntax

commit dbfdae5f8416d9ff60e8710029e6b5ffa72c529b
Merge: c3bb143 e52127b
Author: Josh Lory <josh.lory@code.org>
Date:   Thu Nov 20 12:34:49 2014 -0800

    Merge pull request #503 from code-dot-org/function-edit-icon

    Update the function edit button to match existing icon styles

commit e52127b39f100ba0d29fe35bb2f3fc140c208694
Author: Josh Lory <josh.lory@code.org>
Date:   Thu Nov 20 12:26:25 2014 -0800

    Use default cursor (the same cursor is used for icons)

commit c3bb143c78094db0c19a35531b8e08ac48a8ebe7
Merge: 2fbbac8 8a9dfd5
Author: breville <breville@users.noreply.github.com>
Date:   Thu Nov 20 12:21:58 2014 -0800

    Merge pull request #500 from code-dot-org/fixdecorationanimation

    Fix occasional array bounds JS error in decoration animation
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
resolve merge conflict: add ro.code.org file and curriculm msm 8
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
Automatically built.

commit dbea1790658858489e9877f469e87c08b0658e59
Merge: a3a35a7 72b1619
Author: Continuous Integration <dev@code.org>
Date:   Thu Nov 20 23:41:03 2014 +0000

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

commit 72b1619c4df019cafc44243de49c5fd129f194cf
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Thu Nov 20 15:40:34 2014 -0800

    Fixed inline style.

commit 89aad72a9108bcd33b7f4a0377e5c61ed79c4378
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Thu Nov 20 15:30:00 2014 -0800

    Change inline styles for bold text.

commit b2b591176f771ba5550aaf27af9fd4716c3e9aa1
Merge: fcc74be 929d80f
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Thu Nov 20 15:28:06 2014 -0800

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

commit fcc74be17cef38182318c07b4712df19462d8087
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Thu Nov 20 15:27:44 2014 -0800

    fix test (forgot to check infile)

commit 929d80fbad80a40261d7a3f7d0092ed04ff883dd
Author: Josh Lory <josh.lory@code.org>
Date:   Thu Nov 20 15:20:47 2014 -0800

    Fix 5px gap in modal function editor layout

    Chrome calculates the #headers div as 45px when .blockly-header elements
    have overflow:hidden.  Should only be 40px, so set the value explicitly.

commit 893860aaa515eb7173a17a64d4a5aa4d2af6cd46
Merge: 4841a91 46b76e3
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Thu Nov 20 15:23:10 2014 -0800

    Merge branch 'gotham' into staging

commit 46b76e3ec7e01bd424fca992640fd61f7ca28118
Author: Rick Hawkins <rick@alchemydes.com>
Date:   Thu Nov 20 15:22:44 2014 -0800

    Properly handle strong and em with the new Gotham on csedweek.org.

commit a3a35a785b10ee727b3e7e4360ea5909708cfff3
Merge: 36e63cb 4841a91
Author: Continuous Integration <dev@code.org>
Date:   Thu Nov 20 23:18:04 2014 +0000

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