merged story
ok manually merged in story changes
fixed the merge
Merge branch 'dev' of github.com:ocelotn/spacecrab into dev

Conflicts:
	testdata/story/story.txt
missing nodes added