Showed tag-feed-form when a single feed is shown. Hid when all feeds selected.
Removed server side sorting in feeds controller
Changes validate rss feed function in feed model
Completed form to tag feed with category.
Resolved merge conflict in feeds_controller
Passing spec for user adds new rss feed
Added js context to user adds feed spec
Merge branch 'master' of github.com:emreiser/loopd
Merge branch 'master' into feature_tests
Added import boostrap to application.css
Emptying field after new form submission