Fixed #1276
Should definitively fix #1263
Fixed #1274
Merge branch 'master' of github.com:FPtje/DarkRP

Conflicts:
	entities/entities/spawned_shipment/commands.lua