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
kim
kim
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
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
asd
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/Level2.png
asd
hjhjhj
asd
asd
asd
minor
Merge remote-tracking branch 'origin/master' into Peter