Added and implemented WeaponPlacement
Fixed merge conflicts
Fixed merge conflicts
Merge branch 'development' of https://github.com/Jokab/Bullet-Inferno into development