Rss feed updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/atom.xml
	public/blog/categories/blogging/atom.xml
	public/blog/categories/web-development/atom.xml