Final push for tonight.
Merge remote-tracking branch 'origin/J'

Conflicts:
	The Midnight Station.gmx/The Midnight Station.project.gmx
INI Saving and dying in.  Other bug fixes.
Merge J into master