adding feeds to topic works without making extra api calls
not even close
edit mode looks nice now
there's a save button now
topics are updated
moved toggleEditMode
resolved merge conflicts
some changes to make sure sorting works
resolved merge conflicts
Merge pull request #62 from CombustibleLemons/jawwad-nested-sortable

Jawwad nested sortable
Merge branch 'master' into devon-milestone-4B

Conflicts:
	rss_reader/main/static/js/controllers.js