Improves weapon-editor
Merge branch 'develop' into temp