equpping and dequipping armor
Merge branch 'staging'