- Updated feeds.txt
Merge branch 'dev'