Distinguishes between OP and normal users and adds user name display
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed