No clue what has gone in to this, hopefully something useful was added
Merge branch 'master' of github.com:aramande/xplrss

Conflicts:
	.gitignore
	feed.cpp
	feed.h
	feedlistitemmodel.cpp
	feedlistitemmodel.h
	feedlistview.cpp
	feedlistview.h
	rssmodel.cpp
	rssmodel.h
	sorter.cpp
	xplrss.cpp
	xplrss.h
	xplrss.pro