Shaarlo's RSS connection for aggregator auto recognizion
Merge remote-tracking branch 'origin/master'

Conflicts:
	xsl/index.xsl