backbone view row
Merge branch 'master' of github.com:leemac/JellyfishRss

Conflicts:
	rss/static/js/views/explorer.js
	rss/static/js/views/subscription-item.js