Merge branch 'master' into sev/luma_hud_vehicles

# Conflicts:
#	qcsrc/client/view.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/tturrets.qc
Simple merge

diff --cc qcsrc/client/vehicles/all.qc
Simple merge

diff --cc qcsrc/server/vehicles/racer.qc
Simple merge

diff --cc qcsrc/server/vehicles/vehicle.qh
Simple merge