Merge branch 'master' of https://github.com/rogerbaer/storymap4
Merge branch 'master' into develop