Merge branch 'master' into Vulkanmannen
kiba
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into Vulkanmannen
Merge branch 'ameroz'
alex
Merge branch 'ameroz'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Character.cpp
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
fix
jump