Minor bugs introduced by the merge.
Merge remote-tracking branch 'origin/master' into brian-editor

Conflicts:
	PuzzlePathDimension/Menus/GameEditorScreen.cs