Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Peter'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject