updating update settings function to update the syncfolder object instead of recreating it
Merge branch 'master' into cmissync