#405 - Propagate sync and conflict flags directly from algorithm -
solved conflicts and sync, solved tests for them
#405 - Propagate sync and conflict flags directly from algorithm -
removed hardcoded path for file, disabled controllers during sync
Merge remote-tracking branch 'origin/master' into GH405-propagate-flags-from-codesync-algorithm
#405 - Propagate sync and conflict flags directly from algorithm - first
revision
Merge remote-tracking branch
'origin/GH405-propagate-flags-from-codesync-algorithm'