SyncService splitted into several classes
Merge branch 'master' into beta