Updated data in FeedStub.
Fix merge conflict
Added BaseStub and UserStub.