Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'Peter'
Merge branch 'master' into Vulkanmannen