Automatically built.

commit 2d4d2426d3259ddf57f9b70ca7472cfd83cc8d15
Merge: 52eb0e5 c3f2069
Author: Continuous Integration <dev@code.org>
Date:   Tue Dec 2 00:53:04 2014 +0000

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

commit 52eb0e5312f8739e547c262a9b3d2ddd399bf9f8
Author: Continuous Integration <dev@code.org>
Date:   Tue Dec 2 00:44:44 2014 +0000

    Dropbox changes