Merge branch 'master' into gh-pages
New feeds amd styling
Updates
Merge branch 'gh-pages'