final touches to user show and activity show pages
fixed merge conflict
Merge pull request #20 from RJFryman/user-activity

User activity - fixed merge conflicts