aimhelper considers bullet lifetime
shipspeed ads up bulletsspeed
Merge branch 'master' of https://github.com/voxelinc/voxellancer into hardpointaimhelper_improvements
smooth aimhelper
Merge branch 'master' of https://github.com/voxelinc/voxellancer into hardpointaimhelper_improvements

Conflicts:
	src/ui/hud/aimhelperhudget.cpp
	src/ui/hud/aimhelperhudget.h
	src/ui/hud/objecthudget.cpp
	src/ui/hud/objecthudgetvoxels.cpp
fix windows build
remove virtual inheritance
objecthudgetcornervoxels to own file, spelling
merge with origin
Merge pull request #421 from voxelinc/remove_virtual_inheritance

remove virtual inheritance
Merge pull request #409 from voxelinc/hardpointaimhelper_improvements

HardpointAimHelper/Target improvements
fix master build
Merge branch 'master' of https://github.com/voxelinc/voxellancer into sound_handling_for_engines

Conflicts:
	data/equipment/engines/piratethruster.ini