Adds changes to master branch
trying to do a merge
Fixes pagination - hopefully
auto changes to feed.xml
merge conflict