Merge branch 'zoning' into jgrpp

Conflicts:
	src/table/sprites.h

src/gfxinit.cpp

@@ -196,6 +196,8 @@ static void LoadSpriteTables()
 		);
 	}
 
+	LoadGrfFile("innerhighlight.grf", SPR_ZONING_INNER_HIGHLIGHT_BASE, i++);
+
 	/* Initialize the unicode to sprite mapping table */
 	InitializeUnicodeGlyphMap();