Merge remote-tracking branch 'origin/master' into peter

Conflicts:
	The Seekers Way 0.2/Maps/level1.png
arrows are fucked atm
bös
menymusic
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'master' into Ameroz
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/State.cpp
dialog next fix
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
fix
Merge remote-tracking branch 'origin/peter'
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/DialogState.cpp