stone
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/vulkanmannen'

Conflicts:
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/level1.png
fix
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Kiba.cpp
	The Seekers Way 0.2/LevelManager.cpp
fix
Merge remote-tracking branch 'origin/master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/level1.png