Update datafeeder main to read new json file
Merge remote-tracking branch 'origin/master'