Merge Storymap5 branch into main project

We are still in Beta, but the project has been signed off today and I'm taking the opportunity to suggest a pull into master.