Merge branch 'dispatchFriendlyTurnouts' into New-Panels
Merge branch 'master' into New-Panels

Conflicts:
	static/Released/DispatchNorth.js
	static/Released/DispatchNorth.svg
	static/Released/DispatchSouth.js
	static/Released/DispatchSouth.svg
	static/Released/NowheresYard.svg
Fixed conflicts

Fixed conflicts
Added Greeley/Gotham

Added Greeley/Gotham
Numbered Greeley Turnouts

Proper turnout numbering and other minor updates
Added Fryton/Fremont

Also renumbered Gotham a bit
Merge branch 'New-Panels'