Bug Fixes

Fixed General store and removed combat weapon shop as it was broken