Revert "Revert "bja""

This reverts commit 8b237dba204a08d632b848310e3346631a55d28d.
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject