s
Merge remote-tracking branch 'origin/master' into Vulkanmannen
fix
Merge remote-tracking branch 'origin/Vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Shield.cpp
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject