fixed data sync with rotten api
Merge remote-tracking branch 'origin/fix-sync' into development
Merge branch 'development' into more-tests