fixx
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/MapGenerator.cpp
df
xml!!!
map n Sheeka
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	The Seekers Way 0.2/Character.h