Updated syndication feed import
Merge remote-tracking branch 'github/master'

Conflicts:
	django_yaba/urls.py