Automatically built.

commit 3d2083df1e4b57bbdd1b2898f820c6be42fe4304
Merge: 0356ee1 e7c137a
Author: David Bailey <dsb123@gmail.com>
Date:   Thu Nov 13 16:09:50 2014 -0800

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

commit 0356ee10050d11ec678dfb44395cc16fddcb0579
Merge: a78e932 520bf7b
Author: David Bailey <dsb123@gmail.com>
Date:   Thu Nov 13 16:09:08 2014 -0800

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

commit e7c137a42c785b1c394b96b19d88ccce0fe1ebc4
Author: Josh Lory <josh.lory@code.org>
Date:   Thu Nov 13 16:08:57 2014 -0800

    Let users edit a different function when the modal is already open