Merge remote-tracking branch 'origin/master' into voxel_damage

Conflicts:
	src/ui/inputhandler.cpp
rename and decrease diagonal damage
Merge branch 'master' into voxel_damage

Conflicts:
	src/game.cpp
	src/worldobject/worldobjectcomponents.cpp
Add WorldObjectType
added query for ships to world
altered collisionfilter to use worldobjecttype
Merge branch 'master' into voxel_damage

Conflicts:
	src/resource/colorcoder.h
Merge pull request #424 from voxelinc/voxel_damage

Fuel Voxel Damage
Merge branch 'master' of https://github.com/voxelinc/voxellancer into worldobjecttype
remove WorldObjectType
Merge pull request #450 from voxelinc/worldobjecttype

Add WorldObjectType
Merge branch 'master' into daedalus, fix colors

Conflicts:
	src/scenarios/frozengamescenario.cpp