sddfpdfasd
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/DialogState.cpp
Videoworks!
video
Merge remote-tracking branch 'origin/peter'
Merge remote-tracking branch 'origin/peter'
video
fix
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/IntroScreen.cpp
	The Seekers Way 0.2/IntroScreen.h
	The Seekers Way 0.2/sfTheora-1.4/Readme.txt
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/StartMenu.cpp
	The Seekers Way 0.2/StartMenu.h
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into peter