removed hardcoded feed links
Merge commit '3505f1a97574e5b2255376dfc60e9837ccee963a' into develop