Dropbox changes
Merge branch 'finished' of github.com:code-dot-org/dashboard into finished

Conflicts:
	config/locales/multi.en.yml