Added two missing NPcs and fixed some map errors.
Merge branch 'master' of https://github.com/PrinterLUA/FORGOTTENSERVER-ORTS