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