bug fixes

Fixed Error in Town Tax Collection
Fixed Null exception when creating shop