first version of synchronisation settings
Merge branch 'master' into sync-resources
resources in progress
Merge branch 'master' into sync-resources
synchronize => synchronise
Merge branch 'master' into beta
Merge branch 'master' into sync-resources
synchronisation preference strings
Merge branch 'master' into beta