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