Fixing bug in autocomplete returning lost feeds.
Merge branch 'master' into circular

* master:
  Fixing bug in autocomplete returning lost feeds.

Conflicts:
	apps/rss_feeds/views.py