refactoring feed sidebar
Merge branch 'master' into theradiocc