upstream new feed detail page macros
Merge pull request #530 from spasovski/feed

upstream new feed detail page macros