Add support for melee martial arts with weapon sets
Merge remote-tracking branch 'OvenBaker/weapon-martial-arts'