last sec fixes
Merge branch 'Bradens-Work' of https://github.com/tvand7093/forgottenserver into Bradens-Work
testing map commit