Merge remote-tracking branch 'origin/master' into Peter
dialog for xml
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/Levelkoncept 7.wav
dialog xml fix
Merge remote-tracking branch 'origin/Peter'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject