Story updates
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding

Conflicts:
	modules/story/client/view/component/storyContentComponent.jade