Dropbox changes
Merge pull request #246 from code-dot-org/staging

Dropbox changes