preliminary feed styling and feed generation reordering
Merge remote-tracking branch 'origin/master'