UI - demo story edited
Merge conflict
Demo preparation -story
Merge branch 'master' of https://github.com/kasparov/StoryTeller.git
Merge branch 'master' of https://github.com/kasparov/StoryTeller.git
Final touches
Merge branch 'master' of https://github.com/kasparov/StoryTeller.git