Merge pull request #1 from EliteTK/master

Back merge to update repo
added usp test
Made 3 new testing shipments.
Fixed the m9k weapons from merge
TEST: Ammo
Added ammo types for m9k
Update disabled_defaults.lua
Fixed ammo
Added ammo shipment
Update shipments.lua
Update shipments.lua
Update shipments.lua
Added ammo shipments
Update shipments.lua
Merge pull request #6 from markrjg/master

Changes to ammo, shipments and jobs