removed armor categories from armor list
Merge branch 'develop'