Dropbox Settings can be toggled
Merge conflicted rebase
Merge remote-tracking branch 'origin/master'
Toogle DropboxSetting in initial View