g
Merge remote-tracking branch 'origin/master' into Vulkanmannen
Character move
Character move
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/Character.cpp
Character move
Merge remote-tracking branch 'origin/Vulkanmannen' into Ameroz
Merge branch 'Peter' of https://github.com/Vulkanmannen/TheSeekersWayProject into Peter