Minor fix
Fixes
Remove unnecessary code
People sync updated:
1) only active sync disabled
2) sync algorithm refactored
3) sync now supports reloading in case of failure
Copies resolving refactored
Merge branch 'master' into new_copy_resolving_feature