levelskit
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
finishdoor
Merge branch 'vulkanmannen'
dialog v1
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
dialog
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Peter'
fix
Merge remote-tracking branch 'origin/Peter'
Merge branch 'master' into Ameroz
level3 osv
dialog v2
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Peter'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/Peter'
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Peter'