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

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