working on user show
Merge branch 'master' into usershow
updated user show, fixed facebook issues with activity creation
Merge pull request #18 from RJFryman/usershow

Usershow