More feed management dialog stuff.
Merge branch 'master' of https://github.com/poloure/drunken-archer
Merge pull request #28 from Currfyg/master

Merge