Merge pull request #15 from taabi/master

Pulling Tabish's Updates to FeedView