fixed merge conflict in PSDayTableViewController.m
Changed Feed Cells to use models and layout properly