weapon bug fixes
change to weapon config
bug fixes
fixed score
Merge branch 'master' into Leif