More cleanup
Merge remote-tracking branch 'origin/Fimbul-Prototype' into Fimbul-Prototype

Conflicts:
	Fimbul/Fimbul/World.cpp