feeds template fixed, and other template fixes.
merge conflicts
Merge branch 'master' into custom-userprofile