Merge branch 'alex'

Conflicts:
	_site/atom.xml
	_site/rss.xml
gg