Weapons Factory
Merge remote-tracking branch 'origin/battleanim' into battleanim