equip/unequip clean up of pthayer3
equip/unequip system development
equip/unequip system development
Merge remote-tracking branch 'upstream/master' into dev