Hopefully solves merge conflicts, and other fixes. Removes tie from detective suit, adds clip-on tie to detective locker. Adds telescopic baton to detective spawn gear, as a melee takedown alternative to using the gun.