Make RSS and ATOM templates theme-independent.
Merge branch 'master' into new-theme
Merged fix of atom/rss templates with new theme