Merge pull request #1071 from stevewithington/develop

feeds: move add/remove buttons to be more user-friendly