Fixes in shooting
Merge branch 'master' into Weapons