fix
video
fade movie
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/IntroScreen.cpp
	The Seekers Way 0.2/Maps/Level2.png
	The Seekers Way 0.2/Maps/Level3.png
	The Seekers Way 0.2/Maps/level1.png
	The Seekers Way 0.2/State.cpp
	The Seekers Way 0.2/The Seekers Way.vcxproj
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
dialog color
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Dialogue, DAYOO
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
analklåda och massa uppdaterade bilder

Massa uppdaterade bilder och lite analklåda
new dialog shortcut
Dialog
jiop
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/peter'
Merge remote-tracking branch 'origin/master' into peter
Dialog HOT FIX
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
kamera
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
	The Seekers Way 0.2/Maps/level1.png