asd
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/Level2.png
asd
hjhjhj
asd
asd
woodenwall
woodenwall
asd
Merge remote-tracking branch 'origin/Peter'
final fix
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Level2.png
	The Seekers Way 0.2/Level2Object.png
asd
Merge branch 'Ameroz'

Conflicts:
	The Seekers Way 0.2/WoodenWall.cpp
	The Seekers Way 0.2/level1.png
	The Seekers Way 0.2/woodenwall.png
sfemovie'
stone
stone
asd
stone
mappar