Main Rss correction
Merge remote-tracking branch 'origin/master'

Conflicts:
	rss.php
Archive page correction