Added tags controller for category form
Merge branch 'master' into add_categories
Rendered json for feeds index. Removed html for content in feeds index and side-bar
Merge branch 'master' of github.com:emreiser/loopd
Added html to feeds index format response
Resolved merge conflict in feeds controller