NPCs implemented. Item drops and other changes.
Merge remote-tracking branch 'origin/master' into Zargy