Added the shell of a new weapon upgrade mixin
Merge
Merge branch 'refs/remotes/origin/master'