NAPF Final

Better protection for friendly trader, replaced Short Hbarrier3 with
proper non DZE varriant. Helicopter pads added to boat vendors.