Showed tag-feed-form when a single feed is shown. Hid when all feeds selected.
Completed form to tag feed with category.
Resolved merge conflict in feeds_controller
Merge branch 'master' of github.com:emreiser/loopd
Merge branch 'master' into feature_tests