Update synced_folder setting
Merge branch 'develop'