Merge branch 'master' into develop
Going back to assigning possible attachment directly to weapons and armor. Now just have to clean up after the attachment groups
Merge branch 'develop'