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

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

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

Conflicts:
	The Seekers Way 0.2/Kiba.cpp
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Kiba.cpp
	The Seekers Way 0.2/level1.png
bana osv
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into Peter