Revert "remove unique pointer member"

This reverts commit 6d55354624f3bf44d231cb2eb8453de8de807504.
Merge branch 'master' of https://github.com/voxelinc/voxellancer into add_unique_pointer_to_reduce_dependencies

Conflicts:
	src/player.cpp
	src/player.h
	src/voxel/voxelcluster.cpp
	src/voxel/voxelcluster.h
apply discussed changes
continue
nearly done
fix linux build
Merge branch 'master' of https://github.com/voxelinc/voxellancer into add_unique_pointer_to_reduce_dependencies

Conflicts:
	src/ai/basictasks/patrolwaypointstask.cpp
	src/ai/basictasks/patrolwaypointstask.h
	src/ai/formationlogic.cpp
	src/display/gamescene.cpp
	src/display/gamescene.h
	src/display/rendering/postprocessingpass.inl
	src/display/stereoview.cpp
	src/display/stereoview.h
	src/game.cpp
	src/game.h
	src/physics/physics.h
	src/player.cpp
	src/player.h
	src/property/propertycollection.h
	src/resource/clustercache.cpp
	src/resource/clustercache.h
	src/scenarios/battlescenario.cpp
	src/skybox.h
	src/ui/hud/aimhelperhudget.cpp
	src/ui/hud/hud.cpp
	src/ui/voxelfont.cpp
	src/voxel/voxelrenderer.cpp
	src/voxel/voxelrenderer.h
	src/voxel/voxeltreenode.h
	src/voxeleffect/enginetrailgenerator.cpp
	src/voxeleffect/enginetrailgenerator.h
	src/voxeleffect/voxelparticleworld.cpp
	src/voxeleffect/voxelparticleworld.h
	src/worldobject/engine.cpp
	src/worldobject/engine.h
	src/worldobject/ship.cpp
	src/worldobject/weapons/bullet.cpp
	src/worldobject/weapons/bulletspawnhelper.cpp
	src/worldobject/weapons/rocket.cpp
	src/worldobject/weapons/rocketlauncher.cpp
	src/worldobject/worldobject.cpp
	src/worldobject/worldobject.h
fix merge
fix perf test
improved the Mo X
improved mox and weapons
Merge pull request #319 from voxelinc/add_unique_pointer_to_reduce_dependencies

Add unique pointer to reduce dependencies
intermediate state on PropertyDirectory
remove virtual inheritance
Merge pull request #421 from voxelinc/remove_virtual_inheritance

remove virtual inheritance
DirectoryReader; PropertyDirectory
merge with master