Merge branch 'master' into develop
Implemented attachement groups to match up attachements with armor and weapons. This will replace the armor to armor_attachment and weapon to weapon_attachment relations.