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
Ändrat i lvl 3
Stone Level

For testing
dialog xml fix
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Peter'
asd
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Level 3 XML fix
Tutorial Signs

Förminskade
Level 3 QUICK FIX
dialog av alex ;-)
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'peter'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Maps/Level3.png
	The Seekers Way 0.2/Maps/level1.png
Level 3 fix

???
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
dialog journal fix