fixing user_feed_controller_spec
Merge branch 'master' into refactoring