Story Changes
Merge branch 'master' of https://github.com/burmat/StoryMixes

Conflicts:
	src/app/story/story.js
	src/app/story/story.tpl.html