NPC Shops worked on.
Merge remote-tracking branch 'origin/Zargy'

Conflicts:
	The Midnight Station.gmx/The Midnight Station.project.gmx