Bunches of NPC stuff.
Merge remote-tracking branch 'origin/J' into Zargy

Conflicts:
	The Midnight Station.gmx/The Midnight Station.project.gmx
A few changes.