User view and -controller added, story-show modified
Merge branch 'master' of https://github.com/CrowdStory/CrowdStory