no more dropbox service file
Merge branch 'master' into desktop