git
Merge remote-tracking branch 'origin/master' into Vulkanmannen

Conflicts:
	The Seekers Way 0.2/Sheeka.cpp
dfal
Merge remote-tracking branch 'origin/master' into Vulkanmannen
jump animation och uppdatering
Merge remote-tracking branch 'origin/Vulkanmannen'