Automatically built.

commit 452c281e344553dbfd7b300bf6a107c9ae557664
Merge: 06420d5 6852082
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Oct 2 16:27:08 2014 -0700

    Merge pull request #79 from code-dot-org/disallowed_text_detection

    Show error message when trying to share programs with disallowed text

commit 06420d571f8939cb0382fe7f1a1bc382d69f2b56
Merge: c645e42 3cdfb14
Author: David Bailey <dsb123@gmail.com>
Date:   Thu Oct 2 16:06:05 2014 -0700

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

commit c645e4281ab78b3eb9cda27acf701e72755be857
Author: David Bailey <dsb123@gmail.com>
Date:   Thu Oct 2 16:05:32 2014 -0700

    Revert "Update HoC video for Employee Engagement. remove download link."

    This reverts commit 0020a3fc427d9bfa66b890e5d8b533fd99701d96.

commit 3cdfb148acd9d5f215da0a6fac29768c6b88664c
Merge: c5bbcd8 af469f7
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Thu Oct 2 15:59:04 2014 -0700

    Merge pull request #94 from code-dot-org/advocacy_map

    Smooth scroll and new ordering.

commit 6852082abce6eaa6d7a5d6b1c47dd936219dafeb
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Oct 2 15:56:44 2014 -0700

    Update secrets with WebPurify key

commit f729bfd29887ddae91f1b6ceefe3a4f1e87a45bf
Merge: 817c414 ac0edb7
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Oct 2 15:53:39 2014 -0700

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

    Conflicts:
    	aws/secrets.tgz.aes

commit c5bbcd808425a9ab459ea42c857d155216c67c5e
Merge: 0020a3f ac0edb7
Author: David Bailey <dsb123@gmail.com>
Date:   Thu Oct 2 15:50:29 2014 -0700

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

commit 0020a3fc427d9bfa66b890e5d8b533fd99701d96
Author: David Bailey <dsb123@gmail.com>
Date:   Thu Oct 2 15:50:25 2014 -0700

    Update HoC video for Employee Engagement. remove download link.

commit ac0edb7ff69342fcd1d365a6740a92fdd2b0117f
Merge: e9c30be 59e5ce4
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Thu Oct 2 15:43:00 2014 -0700

    Merge pull request #98 from code-dot-org/chapterPartners

    eu.code.org navigation reorganization

commit e9c30beb88ab94d5c3e023e66b1aa20eb7500e22
Merge: 3df0827 f03c9d8
Author: Will Jordan <will@code.org>
Date:   Thu Oct 2 15:35:33 2014 -0700

    Merge pull request #97 from code-dot-org/rails_gzip

    use heroku_rails_deflate gem in server environments

commit 817c4141622b47a17d39cf47fa813066b4871273
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Oct 2 15:21:11 2014 -0700

    Extract WebPurify wrapper into its own helper
    - Split out text finding tests to reflect modules

commit 3df08271bdaeae52783f4eb8d926bcf5f97accbb
Author: Continuous Integration <dev@code.org>
Date:   Thu Oct 2 22:11:40 2014 +0000

    Automatically built.

    commit 2294824e797a11ef8ceccd1af213ca6b30ab3585
    Merge: 1bd0484 1c0c15e
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Thu Oct 2 14:56:57 2014 -0700

        Merge pull request #95 from code-dot-org/blockFix

        fix row with single value input

    commit 1c0c15ea4501e523436d5e0e663231a4fb918e85
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Thu Oct 2 14:40:25 2014 -0700

        fix row with single value input

commit 59e5ce481308a2c7ff4fb43e4033578b827bfc4f
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Thu Oct 2 15:06:29 2014 -0700

    eu.code.org navigation reorganization

commit dd229326446391cdafb716b266f7feddbff33e43
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Thu Oct 2 14:59:37 2014 -0700

    Move disallowed sharing tests to own file